]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soc: fsl: qe_ports_ic: Add missing cleanup on device removal
authorFelix Gu <ustc.gu@gmail.com>
Mon, 9 Mar 2026 16:25:30 +0000 (00:25 +0800)
committerChristophe Leroy (CS GROUP) <chleroy@kernel.org>
Fri, 13 Mar 2026 09:13:55 +0000 (10:13 +0100)
Add a devm action handler to properly clean up the irq_domain and
chained handler when the device is removed.

Fixes: f0bcd784e1b7 ("soc: fsl: qe: Add an interrupt controller for QUICC Engine Ports")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://lore.kernel.org/r/20260310-qe_ports_ic-v1-1-608293026561@gmail.com
Signed-off-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
drivers/soc/fsl/qe/qe_ports_ic.c

index 8e2107e2cde5b29635888848f20dba47ad65bb83..5e3fae19f31417ebbc4f6ad39d49e6885da9e3d6 100644 (file)
@@ -17,6 +17,7 @@
 struct qepic_data {
        void __iomem *reg;
        struct irq_domain *host;
+       int irq;
 };
 
 static void qepic_mask(struct irq_data *d)
@@ -92,11 +93,18 @@ static const struct irq_domain_ops qepic_host_ops = {
        .map = qepic_host_map,
 };
 
+static void qepic_remove(void *res)
+{
+       struct qepic_data *data = res;
+
+       irq_set_chained_handler_and_data(data->irq, NULL, NULL);
+       irq_domain_remove(data->host);
+}
+
 static int qepic_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct qepic_data *data;
-       int irq;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
@@ -106,17 +114,18 @@ static int qepic_probe(struct platform_device *pdev)
        if (IS_ERR(data->reg))
                return PTR_ERR(data->reg);
 
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0)
-               return irq;
+       data->irq = platform_get_irq(pdev, 0);
+       if (data->irq < 0)
+               return data->irq;
 
        data->host = irq_domain_add_linear(dev->of_node, 32, &qepic_host_ops, data);
        if (!data->host)
                return -ENODEV;
 
-       irq_set_chained_handler_and_data(irq, qepic_cascade, data);
+       irq_set_chained_handler_and_data(data->irq, qepic_cascade, data);
+
+       return devm_add_action_or_reset(dev, qepic_remove, data);
 
-       return 0;
 }
 
 static const struct of_device_id qepic_match[] = {