gpio: lynxpoint: 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

1 files changed, 20 insertions, 15 deletions

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 31b4a091ab60..6bb9741ad036 100644
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -358,25 +358,30 @@ static int lp_gpio_probe(struct platform_device *pdev)
         gc->can_sleep = false;
         gc->parent = dev;
 
-        ret = devm_gpiochip_add_data(dev, gc, lg);
-        if (ret) {
-                dev_err(dev, "failed adding lp-gpio chip\n");
-                return ret;
-        }
-
         /* set up interrupts  */
         if (irq_rc && irq_rc->start) {
+                struct gpio_irq_chip *girq;
+
+                girq = &gc->irq;
+                girq->chip = &lp_irqchip;
+                girq->parent_handler = lp_gpio_irq_handler;
+                girq->num_parents = 1;
+                girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents,
+                                             sizeof(*girq->parents),
+                                             GFP_KERNEL);
+                if (!girq->parents)
+                        return -ENOMEM;
+                girq->parents[0] = (unsigned)irq_rc->start;
+                girq->default_type = IRQ_TYPE_NONE;
+                girq->handler = handle_simple_irq;
+
                 lp_gpio_irq_init_hw(lg);
-                ret = gpiochip_irqchip_add(gc, &lp_irqchip, 0,
-                                           handle_simple_irq, IRQ_TYPE_NONE);
-                if (ret) {
-                        dev_err(dev, "failed to add irqchip\n");
-                        return ret;
-                }
+        }
 
-                gpiochip_set_chained_irqchip(gc, &lp_irqchip,
-                                             (unsigned)irq_rc->start,
-                                             lp_gpio_irq_handler);
+        ret = devm_gpiochip_add_data(dev, gc, lg);
+        if (ret) {
+                dev_err(dev, "failed adding lp-gpio chip\n");
+                return ret;
         }
 
         pm_runtime_enable(dev);