pinctrl: stmfx: Use irqchip template

This makes the driver use the irqchip template to assign
properties to the gpio_irq_chip instead of using the
explicit calls to gpiochip_irqchip_add_nested() and
gpiochip_set_nested_irqchip(). The irqchip is instead
added while adding the gpiochip.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Amelie Delaunay <amelie.delaunay@st.com>
Cc: Benjamin Gaignard <benjamin.gaignard@st.com>
Link: https://lore.kernel.org/r/20200721131814.357182-1-linus.walleij@linaro.org

diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index 1aae803c12cd133951a2bf69960c969cab1a8b38..008c83107a3ca8de4e33a66621f9e37164af3a32 100644 (file)
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -616,6 +616,7 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
        struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);
        struct device_node *np = pdev->dev.of_node;
        struct stmfx_pinctrl *pctl;
+       struct gpio_irq_chip *girq;
        int irq, ret;
 
        pctl = devm_kzalloc(stmfx->dev, sizeof(*pctl), GFP_KERNEL);
@@ -674,16 +675,6 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
        pctl->gpio_chip.can_sleep = true;
        pctl->gpio_chip.of_node = np;
 
-       ret = devm_gpiochip_add_data(pctl->dev, &pctl->gpio_chip, pctl);
-       if (ret) {
-               dev_err(pctl->dev, "gpio_chip registration failed\n");
-               return ret;
-       }
-
-       ret = stmfx_pinctrl_gpio_function_enable(pctl);
-       if (ret)
-               return ret;
-
        pctl->irq_chip.name = dev_name(pctl->dev);
        pctl->irq_chip.irq_mask = stmfx_pinctrl_irq_mask;
        pctl->irq_chip.irq_unmask = stmfx_pinctrl_irq_unmask;
@@ -693,13 +684,26 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
        pctl->irq_chip.irq_request_resources = stmfx_gpio_irq_request_resources;
        pctl->irq_chip.irq_release_resources = stmfx_gpio_irq_release_resources;
 
-       ret = gpiochip_irqchip_add_nested(&pctl->gpio_chip, &pctl->irq_chip,
-                                         0, handle_bad_irq, IRQ_TYPE_NONE);
+       girq = &pctl->gpio_chip.irq;
+       girq->chip = &pctl->irq_chip;
+       /* This will let us handle the parent IRQ in the driver */
+       girq->parent_handler = NULL;
+       girq->num_parents = 0;
+       girq->parents = NULL;
+       girq->default_type = IRQ_TYPE_NONE;
+       girq->handler = handle_bad_irq;
+       girq->threaded = true;
+
+       ret = devm_gpiochip_add_data(pctl->dev, &pctl->gpio_chip, pctl);
        if (ret) {
-               dev_err(pctl->dev, "cannot add irqchip to gpiochip\n");
+               dev_err(pctl->dev, "gpio_chip registration failed\n");
                return ret;
        }
 
+       ret = stmfx_pinctrl_gpio_function_enable(pctl);
+       if (ret)
+               return ret;
+
        ret = devm_request_threaded_irq(pctl->dev, irq, NULL,
                                        stmfx_pinctrl_irq_thread_fn,
                                        IRQF_ONESHOT,
@@ -709,8 +713,6 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
                return ret;
        }
 
-       gpiochip_set_nested_irqchip(&pctl->gpio_chip, &pctl->irq_chip, irq);
-
        dev_info(pctl->dev,
                 "%ld GPIOs available\n", hweight_long(pctl->gpio_valid_mask));