gpio: sifive: Look up IRQs only once during probe

of_irq_count(), or eqivalently platform_irq_count(), simply looks up
successively-numbered IRQs until that fails. Since this driver needs to
look up each IRQ anyway to get its virq number, use that existing loop
to count the IRQs at the same time.

The check against SIFIVE_GPIO_MAX functioned as a bounds check for
chip->irq_number. That is now handled by the loop condition.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index a1b5bae05a353edf93b11c09552c88f7015f5f11..e292c333f8dd9e9be3cd20dbc8c988cff83be1c9 100644 (file)
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -187,7 +187,7 @@ static int sifive_gpio_probe(struct platform_device *pdev)
        struct irq_domain *parent;
        struct gpio_irq_chip *girq;
        struct sifive_gpio *chip;
-       int ret, ngpio, i;
+       int ret, ngpio;
 
        chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
        if (!chip)
@@ -204,13 +204,6 @@ static int sifive_gpio_probe(struct platform_device *pdev)
        if (IS_ERR(chip->regs))
                return PTR_ERR(chip->regs);
 
-       ngpio = of_irq_count(node);
-       if (ngpio > SIFIVE_GPIO_MAX) {
-               dev_err(dev, "Too many GPIO interrupts (max=%d)\n",
-                       SIFIVE_GPIO_MAX);
-               return -ENXIO;
-       }
-
        irq_parent = of_irq_find_parent(node);
        if (!irq_parent) {
                dev_err(dev, "no IRQ parent node\n");
@@ -223,11 +216,11 @@ static int sifive_gpio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       for (i = 0; i < ngpio; i++) {
-               ret = platform_get_irq(pdev, i);
+       for (ngpio = 0; ngpio < SIFIVE_GPIO_MAX; ngpio++) {
+               ret = platform_get_irq_optional(pdev, ngpio);
                if (ret < 0)
-                       return ret;
-               chip->irq_number[i] = ret;
+                       break;
+               chip->irq_number[ngpio] = ret;
        }
 
        ret = bgpio_init(&chip->gc, dev, 4,