pinctrl: intel: Pass irqchip when adding gpiochip

We need to convert all old gpio irqchips to pass the irqchip
setup along when adding the gpio_chip. For more info see
drivers/gpio/TODO.

For chained irqchips this is a pretty straight-forward conversion.

Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 2f4629bbb3134b66b865e080af8a12230c124e15..74fdfd2b9ff57ba9b816c08683333bee836559dd 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1194,6 +1194,7 @@ static unsigned int intel_gpio_ngpio(const struct intel_pinctrl *pctrl)
 static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq)
 {
        int ret;
+       struct gpio_irq_chip *girq;
 
        pctrl->chip = intel_gpio_chip;
 
@@ -1214,16 +1215,9 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq)
        pctrl->irqchip.irq_set_wake = intel_gpio_irq_wake;
        pctrl->irqchip.flags = IRQCHIP_MASK_ON_SUSPEND;
 
-       ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl);
-       if (ret) {
-               dev_err(pctrl->dev, "failed to register gpiochip\n");
-               return ret;
-       }
-
        /*
-        * We need to request the interrupt here (instead of providing chip
-        * to the irq directly) because on some platforms several GPIO
-        * controllers share the same interrupt line.
+        * On some platforms several GPIO controllers share the same interrupt
+        * line.
         */
        ret = devm_request_irq(pctrl->dev, irq, intel_gpio_irq,
                               IRQF_SHARED | IRQF_NO_THREAD,
@@ -1233,14 +1227,20 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq)
                return ret;
        }
 
-       ret = gpiochip_irqchip_add(&pctrl->chip, &pctrl->irqchip, 0,
-                                  handle_bad_irq, IRQ_TYPE_NONE);
+       girq = &pctrl->chip.irq;
+       girq->chip = &pctrl->irqchip;
+       /* This will let us handle the IRQ in the driver */
+       girq->parent_handler = NULL;
+       girq->num_parents = 0;
+       girq->default_type = IRQ_TYPE_NONE;
+       girq->handler = handle_bad_irq;
+
+       ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl);
        if (ret) {
-               dev_err(pctrl->dev, "failed to add irqchip\n");
+               dev_err(pctrl->dev, "failed to register gpiochip\n");
                return ret;
        }
 
-       gpiochip_set_chained_irqchip(&pctrl->chip, &pctrl->irqchip, irq, NULL);
        return 0;
 }