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: 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>

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 2df693bb2693272f6d5bcd34294b17a8d1baced4..ff5d54dc9aeef3039cbbc58fd14d4009ed5852e6 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -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 @@ exit:
 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);