pinctrl: qcom ssbi-mpp: Convert to immutable irq_chip

Convert the driver to immutable irq-chip with a bit of
intuition.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230414-immutable-irqchips-2-v1-5-6b59a5186b00@linaro.org

diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
index 86f66cb8bf30ab32f4d06be9a951b74775f02cc2..b5aed540f07ec428ddfe60a7877ba597bd062a1a 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
@@ -126,7 +126,6 @@ struct pm8xxx_mpp {
        struct regmap *regmap;
        struct pinctrl_dev *pctrl;
        struct gpio_chip chip;
-       struct irq_chip irq;
 
        struct pinctrl_desc desc;
        unsigned npins;
@@ -778,6 +777,32 @@ static int pm8xxx_mpp_child_to_parent_hwirq(struct gpio_chip *chip,
        return 0;
 }
 
+static void pm8xxx_mpp_irq_disable(struct irq_data *d)
+{
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+
+       gpiochip_disable_irq(gc, irqd_to_hwirq(d));
+}
+
+static void pm8xxx_mpp_irq_enable(struct irq_data *d)
+{
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+
+       gpiochip_enable_irq(gc, irqd_to_hwirq(d));
+}
+
+static const struct irq_chip pm8xxx_mpp_irq_chip = {
+       .name = "ssbi-mpp",
+       .irq_mask_ack = irq_chip_mask_ack_parent,
+       .irq_unmask = irq_chip_unmask_parent,
+       .irq_disable = pm8xxx_mpp_irq_disable,
+       .irq_enable = pm8xxx_mpp_irq_enable,
+       .irq_set_type = irq_chip_set_type_parent,
+       .flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE |
+               IRQCHIP_IMMUTABLE,
+       GPIOCHIP_IRQ_RESOURCE_HELPERS,
+};
+
 static const struct of_device_id pm8xxx_mpp_of_match[] = {
        { .compatible = "qcom,pm8018-mpp", .data = (void *) 6 },
        { .compatible = "qcom,pm8038-mpp", .data = (void *) 6 },
@@ -871,14 +896,8 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
        if (!parent_domain)
                return -ENXIO;
 
-       pctrl->irq.name = "ssbi-mpp";
-       pctrl->irq.irq_mask_ack = irq_chip_mask_ack_parent;
-       pctrl->irq.irq_unmask = irq_chip_unmask_parent;
-       pctrl->irq.irq_set_type = irq_chip_set_type_parent;
-       pctrl->irq.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE;
-
        girq = &pctrl->chip.irq;
-       girq->chip = &pctrl->irq;
+       gpio_irq_chip_set_chip(girq, &pm8xxx_mpp_irq_chip);
        girq->default_type = IRQ_TYPE_NONE;
        girq->handler = handle_level_irq;
        girq->fwnode = dev_fwnode(pctrl->dev);