浏览代码

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>
Andy Shevchenko 7 年之前
父节点
当前提交
9b073332dd
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/gpio/gpio-bcm-kona.c

+ 4 - 2
drivers/gpio/gpio-bcm-kona.c

@@ -485,12 +485,14 @@ static void bcm_kona_gpio_irq_handler(struct irq_desc *desc)
 static int bcm_kona_gpio_irq_reqres(struct irq_data *d)
 static int bcm_kona_gpio_irq_reqres(struct irq_data *d)
 {
 {
 	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);
 	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);
+	int ret;
 
 
-	if (gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) {
+	ret = gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq);
+	if (ret) {
 		dev_err(kona_gpio->gpio_chip.parent,
 		dev_err(kona_gpio->gpio_chip.parent,
 			"unable to lock HW IRQ %lu for IRQ\n",
 			"unable to lock HW IRQ %lu for IRQ\n",
 			d->hwirq);
 			d->hwirq);
-		return -EINVAL;
+		return ret;
 	}
 	}
 	return 0;
 	return 0;
 }
 }