OSDN Git Service

staging: mt7621-gpio: avoid to set up irqs if not defined in dts
authorSergio Paracuellos <sergio.paracuellos@gmail.com>
Mon, 18 Jun 2018 09:36:15 +0000 (11:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Jun 2018 12:50:58 +0000 (21:50 +0900)
If there is no interrupt defined in the dts 'irq_of_parse_and_map'
returns 0 and we should't set up interrupts for each gpio chip in
that case.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/mt7621-gpio/gpio-mt7621.c

index 1318003..96dee10 100644 (file)
@@ -237,30 +237,32 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank)
                return ret;
        }
 
-       /*
-        * Manually request the irq here instead of passing a flow-handler
-        * to gpiochip_set_chained_irqchip, because the irq is shared.
-        */
-       ret = devm_request_irq(&pdev->dev, gpio->gpio_irq,
-                              mediatek_gpio_irq_handler, IRQF_SHARED,
-                              "mt7621", &rg->chip);
+       if (gpio->gpio_irq) {
+               /*
+                * Manually request the irq here instead of passing a flow-handler
+                * to gpiochip_set_chained_irqchip, because the irq is shared.
+                */
+               ret = devm_request_irq(&pdev->dev, gpio->gpio_irq,
+                                      mediatek_gpio_irq_handler, IRQF_SHARED,
+                                      "mt7621", &rg->chip);
+
+               if (ret) {
+                       dev_err(&pdev->dev, "Error requesting IRQ %d: %d\n",
+                               gpio->gpio_irq, ret);
+                       return ret;
+               }
 
-       if (ret) {
-               dev_err(&pdev->dev, "Error requesting IRQ %d: %d\n",
-                       gpio->gpio_irq, ret);
-               return ret;
-       }
+               ret = gpiochip_irqchip_add(&rg->chip, &mediatek_gpio_irq_chip,
+                                          0, handle_simple_irq, IRQ_TYPE_NONE);
+               if (ret) {
+                       dev_err(&pdev->dev, "failed to add gpiochip_irqchip\n");
+                       return ret;
+               }
 
-       ret = gpiochip_irqchip_add(&rg->chip, &mediatek_gpio_irq_chip,
-                                  0, handle_simple_irq, IRQ_TYPE_NONE);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to add gpiochip_irqchip\n");
-               return ret;
+               gpiochip_set_chained_irqchip(&rg->chip, &mediatek_gpio_irq_chip,
+                                            gpio->gpio_irq, NULL);
        }
 
-       gpiochip_set_chained_irqchip(&rg->chip, &mediatek_gpio_irq_chip,
-                                    gpio->gpio_irq, NULL);
-
        /* set polarity to low for all gpios */
        mtk_gpio_w32(rg, GPIO_REG_POL, 0);