diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-07-30 08:38:32 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2018-08-06 17:46:55 -0400 |
commit | 9b073332dd12553751951b08f78d7d1416f5bee2 (patch) | |
tree | 2dd54d3938deabd24dbfa9b2490047cbcd2a8f15 | |
parent | 3a2f335c418fed18fc3e4b3d0ee0955e8b2c5f21 (diff) |
gpio: bcm-kona: Don't shadow error code of gpiochip_lock_as_irq()
gpiochip_lock_as_irq() may return a few error codes,
do not shadow them by -EINVAL and let caller to decide.
No functional change intended.
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/gpio/gpio-bcm-kona.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 00272fa7cc4f..d0707fc23afd 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c | |||
@@ -485,12 +485,14 @@ static void bcm_kona_gpio_irq_handler(struct irq_desc *desc) | |||
485 | static int bcm_kona_gpio_irq_reqres(struct irq_data *d) | 485 | static int bcm_kona_gpio_irq_reqres(struct irq_data *d) |
486 | { | 486 | { |
487 | struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d); | 487 | struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d); |
488 | int ret; | ||
488 | 489 | ||
489 | if (gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) { | 490 | ret = gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq); |
491 | if (ret) { | ||
490 | dev_err(kona_gpio->gpio_chip.parent, | 492 | dev_err(kona_gpio->gpio_chip.parent, |
491 | "unable to lock HW IRQ %lu for IRQ\n", | 493 | "unable to lock HW IRQ %lu for IRQ\n", |
492 | d->hwirq); | 494 | d->hwirq); |
493 | return -EINVAL; | 495 | return ret; |
494 | } | 496 | } |
495 | return 0; | 497 | return 0; |
496 | } | 498 | } |