pinctrl: oxnas: 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: Neil Armstrong <narmstrong@baylibre.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20191002113819.4927-1-linus.walleij@linaro.org

diff --git a/drivers/pinctrl/pinctrl-oxnas.c b/drivers/pinctrl/pinctrl-oxnas.c
index 55488ca246f174e2bd77a9ac639d79dda6815b69..40dc1251432a6ebbe4c73bff5755df0b92fab292 100644 (file)
--- a/drivers/pinctrl/pinctrl-oxnas.c
+++ b/drivers/pinctrl/pinctrl-oxnas.c
@@ -1197,6 +1197,7 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
        unsigned int id, ngpios;
        int irq, ret;
        struct resource *res;
+       struct gpio_irq_chip *girq;
 
        if (of_parse_phandle_with_fixed_args(np, "gpio-ranges",
                                             3, 0, &pinspec)) {
@@ -1232,6 +1233,18 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
        bank->gpio_chip.parent = &pdev->dev;
        bank->gpio_chip.of_node = np;
        bank->gpio_chip.ngpio = ngpios;
+       girq = &bank->gpio_chip.irq;
+       girq->chip = &bank->irq_chip;
+       girq->parent_handler = oxnas_gpio_irq_handler;
+       girq->num_parents = 1;
+       girq->parents = devm_kcalloc(&pdev->dev, 1, sizeof(*girq->parents),
+                                    GFP_KERNEL);
+       if (!girq->parents)
+               return -ENOMEM;
+       girq->parents[0] = irq;
+       girq->default_type = IRQ_TYPE_NONE;
+       girq->handler = handle_level_irq;
+
        ret = gpiochip_add_data(&bank->gpio_chip, bank);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to add GPIO chip %u: %d\n",
@@ -1239,18 +1252,6 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = gpiochip_irqchip_add(&bank->gpio_chip, &bank->irq_chip,
-                               0, handle_level_irq, IRQ_TYPE_NONE);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to add IRQ chip %u: %d\n",
-                       id, ret);
-               gpiochip_remove(&bank->gpio_chip);
-               return ret;
-       }
-
-       gpiochip_set_chained_irqchip(&bank->gpio_chip, &bank->irq_chip,
-                                    irq, oxnas_gpio_irq_handler);
-
        return 0;
 }