leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Grygorii Strashko 2015-03-23 14:18:26 +02:00 committed by Linus Walleij
parent 4a58d2296f
commit 37e14ecfb1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,14 +479,13 @@ static int omap_gpio_is_input(struct gpio_bank *bank, unsigned offset)
return readl_relaxed(reg) & BIT(offset); 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 offset)
unsigned offset)
{ {
if (!LINE_USED(bank->mod_usage, offset)) { if (!LINE_USED(bank->mod_usage, offset)) {
omap_enable_gpio_module(bank, offset); omap_enable_gpio_module(bank, offset);
omap_set_gpio_direction(bank, offset, 1); 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) 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); spin_lock_irqsave(&bank->lock, flags);
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, offset);
if (!omap_gpio_is_input(bank, offset)) { if (!omap_gpio_is_input(bank, offset)) {
spin_unlock_irqrestore(&bank->lock, flags); spin_unlock_irqrestore(&bank->lock, flags);
return -EINVAL; return -EINVAL;
@ -803,15 +802,14 @@ exit:
static unsigned int omap_gpio_irq_startup(struct irq_data *d) static unsigned int omap_gpio_irq_startup(struct irq_data *d)
{ {
struct gpio_bank *bank = omap_irq_data_get_bank(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 long flags;
unsigned offset = GPIO_INDEX(bank, gpio); unsigned offset = d->hwirq;
if (!BANK_USED(bank)) if (!BANK_USED(bank))
pm_runtime_get_sync(bank->dev); pm_runtime_get_sync(bank->dev);
spin_lock_irqsave(&bank->lock, flags); 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); spin_unlock_irqrestore(&bank->lock, flags);
omap_gpio_unmask_irq(d); omap_gpio_unmask_irq(d);