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

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

gpio: omap: drop 'gpio' param from omap_gpio_init_irq() 



The 'gpio' parameter isn't needed any more as it
duplicates 'offset' parameter, so drop it.

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 4a58d229

drivers/gpio/gpio-omap.c

+5 −7
Original line number Diff line number Diff line
@@ -479,14 +479,13 @@ static int omap_gpio_is_input(struct gpio_bank *bank, unsigned offset) 
	return readl_relaxed(reg) & BIT(offset);

}



static void omap_gpio_init_irq(struct gpio_bank *bank, unsigned gpio,

			       unsigned offset)

static void omap_gpio_init_irq(struct gpio_bank *bank, unsigned offset)

{

	if (!LINE_USED(bank->mod_usage, offset)) {

		omap_enable_gpio_module(bank, offset);

		omap_set_gpio_direction(bank, offset, 1);

	}

	bank->irq_usage |= BIT(GPIO_INDEX(bank, gpio));

	bank->irq_usage |= BIT(offset);

}



static int omap_gpio_irq_type(struct irq_data *d, unsigned type)
@@ -518,7 +517,7 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) 
	spin_lock_irqsave(&bank->lock, flags);

	offset = GPIO_INDEX(bank, gpio);

	retval = omap_set_gpio_triggering(bank, offset, type);

	omap_gpio_init_irq(bank, gpio, offset);

	omap_gpio_init_irq(bank, offset);

	if (!omap_gpio_is_input(bank, offset)) {

		spin_unlock_irqrestore(&bank->lock, flags);

		return -EINVAL;
@@ -803,15 +802,14 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) 
static unsigned int omap_gpio_irq_startup(struct irq_data *d)

{

	struct gpio_bank *bank = omap_irq_data_get_bank(d);

	unsigned int gpio = omap_irq_to_gpio(bank, d->hwirq);

	unsigned long flags;

	unsigned offset = GPIO_INDEX(bank, gpio);

	unsigned offset = d->hwirq;



	if (!BANK_USED(bank))

		pm_runtime_get_sync(bank->dev);



	spin_lock_irqsave(&bank->lock, flags);

	omap_gpio_init_irq(bank, gpio, offset);

	omap_gpio_init_irq(bank, offset);

	spin_unlock_irqrestore(&bank->lock, flags);

	omap_gpio_unmask_irq(d);