Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2b20045 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Linus Walleij
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Acked-by: default avatarJavier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c4b40493

drivers/gpio/gpio-omap.c

+4 −6
Original line number Diff line number Diff line
@@ -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;



	return readl_relaxed(reg) & mask;

	return readl_relaxed(reg) & BIT(offset);

}



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);

	retval = omap_set_gpio_triggering(bank, offset, type);

	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);

		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)

{

	struct gpio_bank *bank;

	u32 mask;



	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);

	else

		return omap_get_gpio_dataout(bank, offset);