gpio: dwapb: Don't use IRQ 0 as valid Linux interrupt
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 19 May 2020 13:12:32 +0000 (16:12 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 25 May 2020 09:05:09 +0000 (11:05 +0200)
IRQ 0 is not valid in Linux interrupt number space.
Refactor the code with this kept in mind.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Serge Semin <fancer.lancer@gmail.com>
Link: https://lore.kernel.org/r/20200519131233.59032-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-dwapb.c

index 944dae8..d376567 100644 (file)
@@ -417,7 +417,7 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
                int i;
 
                for (i = 0; i < pp->ngpio; i++) {
-                       if (pp->irq[i] >= 0)
+                       if (pp->irq[i])
                                irq_set_chained_handler_and_data(pp->irq[i],
                                                dwapb_irq_handler, gpio);
                }
@@ -538,20 +538,20 @@ static void dwapb_get_irq(struct device *dev, struct fwnode_handle *fwnode,
                          struct dwapb_port_property *pp)
 {
        struct device_node *np = NULL;
-       int j;
+       int irq = -ENXIO, j;
 
        if (fwnode_property_read_bool(fwnode, "interrupt-controller"))
                np = to_of_node(fwnode);
 
        for (j = 0; j < pp->ngpio; j++) {
-               pp->irq[j] = -ENXIO;
-
                if (np)
-                       pp->irq[j] = of_irq_get(np, j);
+                       irq = of_irq_get(np, j);
                else if (has_acpi_companion(dev))
-                       pp->irq[j] = platform_get_irq_optional(to_platform_device(dev), j);
+                       irq = platform_get_irq_optional(to_platform_device(dev), j);
+               if (irq > 0)
+                       pp->irq[j] = irq;
 
-               if (pp->irq[j] >= 0)
+               if (pp->irq[j])
                        pp->has_irq = true;
        }