[PATCH RFC 09/14] drivers: pinctrl: msm: fix use of deprecated gpiolib APIs

[Lina Iyer]

Replace gpiochip_irqchip_add() and gpiochip_set_chained_irqchip() calls
by populating the gpio_irq_chip data structures instead.

Signed-off-by: Lina Iyer <il...@codeaurora.org>
---
 drivers/pinctrl/qcom/pinctrl-msm.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c 
b/drivers/pinctrl/qcom/pinctrl-msm.c
index 7f35c196bb3e..76e8528e4d0a 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -1027,7 +1027,19 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
        pctrl->irq_chip.irq_request_resources = msm_gpio_irq_reqres;
        pctrl->irq_chip.irq_release_resources = msm_gpio_irq_relres;
 
-       ret = gpiochip_add_data(&pctrl->chip, pctrl);
+       chip->irq.chip = &pctrl->irq_chip;
+       chip->irq.default_type = IRQ_TYPE_NONE;
+       chip->irq.handler = handle_bad_irq;
+       chip->irq.fwnode = pctrl->dev->fwnode;
+       chip->irq.parent_handler = msm_gpio_irq_handler;
+       chip->irq.num_parents = 1;
+       chip->irq.parents = devm_kcalloc(pctrl->dev, 1,
+                                        sizeof(*chip->irq.parents),
+                                        GFP_KERNEL);
+       if (!chip->irq.parents)
+               return -ENOMEM;
+
+       ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
        if (ret) {
                dev_err(pctrl->dev, "Failed register gpiochip\n");
                return ret;
@@ -1053,20 +1065,6 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
                }
        }
 
-       ret = gpiochip_irqchip_add(chip,
-                                  &pctrl->irq_chip,
-                                  0,
-                                  handle_edge_irq,
-                                  IRQ_TYPE_NONE);
-       if (ret) {
-               dev_err(pctrl->dev, "Failed to add irqchip to gpiochip\n");
-               gpiochip_remove(&pctrl->chip);
-               return -ENOSYS;
-       }
-
-       gpiochip_set_chained_irqchip(chip, &pctrl->irq_chip, pctrl->irq,
-                                    msm_gpio_irq_handler);
-
        return 0;
 }
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project