Commit f1c32ef1 authored by Russell King's avatar Russell King Committed by Linus Walleij

gpio: omap: irq_startup() must not return error codes

The irq_startup() method returns an unsigned int, but in __irq_startup()
it is assigned to an int.  However, nothing checks for errors, so any
error that is returned is ignored.

Remove the check for GPIO-input mode and the error return.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 40fd422a
...@@ -635,8 +635,6 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d) ...@@ -635,8 +635,6 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d)
if (!LINE_USED(bank->mod_usage, offset)) if (!LINE_USED(bank->mod_usage, offset))
omap_set_gpio_direction(bank, offset, 1); omap_set_gpio_direction(bank, offset, 1);
else if (!omap_gpio_is_input(bank, offset))
goto err;
omap_enable_gpio_module(bank, offset); omap_enable_gpio_module(bank, offset);
bank->irq_usage |= BIT(offset); bank->irq_usage |= BIT(offset);
...@@ -644,9 +642,6 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d) ...@@ -644,9 +642,6 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d)
omap_gpio_unmask_irq(d); omap_gpio_unmask_irq(d);
return 0; return 0;
err:
raw_spin_unlock_irqrestore(&bank->lock, flags);
return -EINVAL;
} }
static void omap_gpio_irq_shutdown(struct irq_data *d) static void omap_gpio_irq_shutdown(struct irq_data *d)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment