UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: omap: convert omap_gpio_is_input() to use gpio offset 

Convert omap_gpio_is_input() to use GPIO offset instead of mask and,
in such way, make code simpler and remove few lines of code.

Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Grygorii Strashko 2015-03-23 14:18:23 +02:00 committed by Linus Walleij
parent c4b40493de
commit b2b2004550
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpio/gpio-omap.c
View File

@ -472,11 +472,11 @@ static void omap_disable_gpio_module(struct gpio_bank *bank, unsigned offset)
} }
} }
static int omap_gpio_is_input(struct gpio_bank *bank, int mask) static int omap_gpio_is_input(struct gpio_bank *bank, unsigned offset)
{ {
void __iomem *reg = bank->base + bank->regs->direction; void __iomem *reg = bank->base + bank->regs->direction;
return readl_relaxed(reg) & mask; return readl_relaxed(reg) & BIT(offset);
} }
static void omap_gpio_init_irq(struct gpio_bank *bank, unsigned gpio, static void omap_gpio_init_irq(struct gpio_bank *bank, unsigned gpio,
@ -519,7 +519,7 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type)
offset = GPIO_INDEX(bank, gpio); offset = GPIO_INDEX(bank, gpio);
retval = omap_set_gpio_triggering(bank, offset, type); retval = omap_set_gpio_triggering(bank, offset, type);
omap_gpio_init_irq(bank, gpio, offset); omap_gpio_init_irq(bank, gpio, offset);
if (!omap_gpio_is_input(bank, BIT(offset))) { if (!omap_gpio_is_input(bank, offset)) {
spin_unlock_irqrestore(&bank->lock, flags); spin_unlock_irqrestore(&bank->lock, flags);
return -EINVAL; return -EINVAL;
} }
@ -976,12 +976,10 @@ static int omap_gpio_input(struct gpio_chip *chip, unsigned offset)
static int omap_gpio_get(struct gpio_chip *chip, unsigned offset) static int omap_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct gpio_bank *bank; struct gpio_bank *bank;
u32 mask;
bank = container_of(chip, struct gpio_bank, chip); bank = container_of(chip, struct gpio_bank, chip);
mask = (BIT(offset));
if (omap_gpio_is_input(bank, mask)) if (omap_gpio_is_input(bank, offset))
return omap_get_gpio_datain(bank, offset); return omap_get_gpio_datain(bank, offset);
else else
return omap_get_gpio_dataout(bank, offset); return omap_get_gpio_dataout(bank, offset);