]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
irqchip: Switch to of_fwnode_handle()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Wed, 19 Mar 2025 09:28:59 +0000 (10:28 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 16 May 2025 19:06:07 +0000 (21:06 +0200)
of_node_to_fwnode() is irqdomain's reimplementation of the "officially"
defined of_fwnode_handle(). The former is in the process of being
removed, so use the latter instead.

[ tglx: Fix up subject prefix ]

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Antonio Borneo <antonio.borneo@foss.st.com>
Reviewed-by: Herve Codina <herve.codina@bootlin.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Acked-by: Herve Codina <herve.codina@bootlin.com> # irq-lan966x-oic
Link: https://lore.kernel.org/all/20250319092951.37667-7-jirislaby@kernel.org
22 files changed:
drivers/irqchip/irq-alpine-msi.c
drivers/irqchip/irq-apple-aic.c
drivers/irqchip/irq-armada-370-xp.c
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
drivers/irqchip/irq-gic-v3.c
drivers/irqchip/irq-ixp4xx.c
drivers/irqchip/irq-lan966x-oic.c
drivers/irqchip/irq-loongarch-cpu.c
drivers/irqchip/irq-loongson-eiointc.c
drivers/irqchip/irq-loongson-htvec.c
drivers/irqchip/irq-loongson-liointc.c
drivers/irqchip/irq-loongson-pch-msi.c
drivers/irqchip/irq-loongson-pch-pic.c
drivers/irqchip/irq-ls-scfg-msi.c
drivers/irqchip/irq-meson-gpio.c
drivers/irqchip/irq-qcom-mpm.c
drivers/irqchip/irq-riscv-intc.c
drivers/irqchip/irq-sni-exiu.c
drivers/irqchip/irq-stm32mp-exti.c
drivers/irqchip/irq-ti-sci-inta.c
drivers/irqchip/irq-ti-sci-intr.c
drivers/irqchip/irq-uniphier-aidet.c

index a1430ab60a8a3f5c57fc466a1e9e2cc5f9a13374..0207d35135da4d2c83f2fbd4cec642db8dab04c8 100644 (file)
@@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,
                return -ENOMEM;
        }
 
-       msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node),
+       msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node),
                                               &alpine_msix_domain_info,
                                               middle_domain);
        if (!msi_domain) {
index 974dc088c8530cd54f3eed3eb147269876239801..032d66dceb8ec4ecea606bba1649e41ff68684ad 100644 (file)
@@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p
 
        irqc->info.die_stride = off - start_off;
 
-       irqc->hw_domain = irq_domain_create_tree(of_node_to_fwnode(node),
+       irqc->hw_domain = irq_domain_create_tree(of_fwnode_handle(node),
                                                 &aic_irq_domain_ops, irqc);
        if (WARN_ON(!irqc->hw_domain))
                goto err_unmap;
@@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p
 
        if (is_kernel_in_hyp_mode()) {
                struct irq_fwspec mi = {
-                       .fwnode         = of_node_to_fwnode(node),
+                       .fwnode         = of_fwnode_handle(node),
                        .param_count    = 3,
                        .param          = {
                                [0]     = AIC_FIQ, /* This is a lie */
index 2aa6a51e05d0cf4a88f10d9adb222f3694e406d3..de98d16c1718f7ec0f161cf51ea497a809b4aeb2 100644 (file)
@@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,
        if (!mpic->msi_inner_domain)
                return -ENOMEM;
 
-       mpic->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), &mpic_msi_domain_info,
+       mpic->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), &mpic_msi_domain_info,
                                                     mpic->msi_inner_domain);
        if (!mpic->msi_domain) {
                irq_domain_remove(mpic->msi_inner_domain);
@@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node)
 {
        int base_ipi;
 
-       mpic->ipi_domain = irq_domain_create_linear(of_node_to_fwnode(node), IPI_DOORBELL_NR,
+       mpic->ipi_domain = irq_domain_create_linear(of_fwnode_handle(node), IPI_DOORBELL_NR,
                                                    &mpic_ipi_domain_ops, mpic);
        if (WARN_ON(!mpic->ipi_domain))
                return -ENOMEM;
index 8e87fc35f8aa00915bd2e9c77d7b07cc5d6ec160..11549d85f23b885abd3438b8e06ef5ad402b171d 100644 (file)
@@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)
                if (!of_property_read_bool(np, "msi-controller"))
                        continue;
 
-               its_fsl_mc_msi_init_one(of_node_to_fwnode(np),
+               its_fsl_mc_msi_init_one(of_fwnode_handle(np),
                                        np->full_name);
        }
 }
index 270d7a4d85a6d7d96f136a077d82bfc036281a82..efc791c43d4415e5daf3a62d697f6a3dab9bee3b 100644 (file)
@@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d,
 
        ppi_idx = __gic_get_ppi_index(ppi_intid);
        ret = partition_translate_id(gic_data.ppi_descs[ppi_idx],
-                                    of_node_to_fwnode(np));
+                                    of_fwnode_handle(np));
        if (ret < 0)
                return ret;
 
@@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 
                part = &parts[part_idx];
 
-               part->partition_id = of_node_to_fwnode(child_part);
+               part->partition_id = of_fwnode_handle(child_part);
 
                pr_info("GIC: PPI partition %pOFn[%d] { ",
                        child_part, part_idx);
index f23b02f62a5c3f9d4b50cb4597c8549e69d01f82..a9a5a52b818a340bee42c66fb32bdd74cef431c0 100644 (file)
@@ -261,7 +261,7 @@ static int __init ixp4xx_of_init_irq(struct device_node *np,
                pr_crit("IXP4XX: could not ioremap interrupt controller\n");
                return -ENODEV;
        }
-       fwnode = of_node_to_fwnode(np);
+       fwnode = of_fwnode_handle(np);
 
        /* These chip variants have 64 interrupts */
        is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||
index 41ac880e3b87d0606348b7f9ee022ed41570c567..9445c3a6b1b01e6c98f57ddce68db24f83d8a694 100644 (file)
@@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev)
                .exit           = lan966x_oic_chip_exit,
        };
        struct irq_domain_info d_info = {
-               .fwnode         = of_node_to_fwnode(pdev->dev.of_node),
+               .fwnode         = of_fwnode_handle(pdev->dev.of_node),
                .domain_flags   = IRQ_DOMAIN_FLAG_DESTROY_GC,
                .size           = LAN966X_OIC_NR_IRQ,
                .hwirq_max      = LAN966X_OIC_NR_IRQ,
index e62dab4c97fcf543020abd5b190b7e81d05c6619..950bc087e38808fa4d61d5c5993ee09265598638 100644 (file)
@@ -100,7 +100,7 @@ static const struct irq_domain_ops loongarch_cpu_intc_irq_domain_ops = {
 static int __init cpuintc_of_init(struct device_node *of_node,
                                struct device_node *parent)
 {
-       cpuintc_handle = of_node_to_fwnode(of_node);
+       cpuintc_handle = of_fwnode_handle(of_node);
 
        irq_domain = irq_domain_create_linear(cpuintc_handle, EXCCODE_INT_NUM,
                                &loongarch_cpu_intc_irq_domain_ops, NULL);
index bb79e19dfb59001cef89fc8c884a1415dd3334c3..b2860eb2d32c55415de96ecf4f34ab1f5eb6c3d6 100644 (file)
@@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node,
                priv->vec_count = VEC_COUNT;
 
        priv->node = 0;
-       priv->domain_handle = of_node_to_fwnode(of_node);
+       priv->domain_handle = of_fwnode_handle(of_node);
 
        ret = eiointc_init(priv, parent_irq, 0);
        if (ret < 0)
index 5da02c7ad0b3075c2ac0a0aa1d9a5724d8906b9c..d8558eb35044516e28f45bd37e35d8d64e61b8e7 100644 (file)
@@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node,
        }
 
        err = htvec_init(res.start, resource_size(&res),
-                       num_parents, parent_irq, of_node_to_fwnode(node));
+                       num_parents, parent_irq, of_fwnode_handle(node));
        if (err < 0)
                return err;
 
index 2b1bd4a96665b4eab6832dd95daca4468c3d661d..95cade56e0be42dbc398a88fee0b425dc4c5c90e 100644 (file)
@@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node,
        }
 
        err = liointc_init(res.start, resource_size(&res),
-                       revision, of_node_to_fwnode(node), node);
+                       revision, of_fwnode_handle(node), node);
        if (err < 0)
                return err;
 
index 9c62108b3ad588103f9f74f03d931fcdb67d760b..c07876ae7b493ab90662543b2eafa5f53b947139 100644 (file)
@@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)
                return -EINVAL;
        }
 
-       err = pch_msi_init(res.start, irq_base, irq_count, parent_domain, of_node_to_fwnode(node));
+       err = pch_msi_init(res.start, irq_base, irq_count, parent_domain, of_fwnode_handle(node));
        if (err < 0)
                return err;
 
index 69efda35a8e78574ca67754c72828c9529a62281..62e6bf3a0611af8d0b4ed33e376279f8e614fe15 100644 (file)
@@ -392,7 +392,7 @@ static int pch_pic_of_init(struct device_node *node,
        }
 
        err = pch_pic_init(res.start, resource_size(&res), vec_base,
-                               parent_domain, of_node_to_fwnode(node), 0);
+                               parent_domain, of_fwnode_handle(node), 0);
        if (err < 0)
                return err;
 
index 3cb80796cc7ccaa5a940e11a39ae056f29a7e522..cbe11a8afe4fd487234f3f3411c33b5c8e9a32f6 100644 (file)
@@ -225,7 +225,7 @@ static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data)
        }
 
        msi_data->msi_domain = pci_msi_create_irq_domain(
-                               of_node_to_fwnode(msi_data->pdev->dev.of_node),
+                               of_fwnode_handle(msi_data->pdev->dev.of_node),
                                &ls_scfg_msi_domain_info,
                                msi_data->parent);
        if (!msi_data->msi_domain) {
index 0a25536a5d0710ca72b8c4d900e195da45dfd312..7d177626d64ba4514c34f7544fce73eb58a67d12 100644 (file)
@@ -607,7 +607,7 @@ static int meson_gpio_irq_of_init(struct device_node *node, struct device_node *
 
        domain = irq_domain_create_hierarchy(parent_domain, 0,
                                             ctl->params->nr_hwirq,
-                                            of_node_to_fwnode(node),
+                                            of_fwnode_handle(node),
                                             &meson_gpio_irq_domain_ops,
                                             ctl);
        if (!domain) {
index 7942d8eb3d00eae5fa7e5718a05ef889bb8a82f0..00c770e367d00817d0829cd46ace1ae93a9c43b1 100644 (file)
@@ -447,7 +447,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent)
 
        priv->domain = irq_domain_create_hierarchy(parent_domain,
                                IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP, pin_cnt,
-                               of_node_to_fwnode(np), &qcom_mpm_ops, priv);
+                               of_fwnode_handle(np), &qcom_mpm_ops, priv);
        if (!priv->domain) {
                dev_err(dev, "failed to create MPM domain\n");
                ret = -ENOMEM;
index f653c13de62b57acdae822fdbed41c881a72ceaa..e5805885394ee3892a9a9784a937e234490ba0ea 100644 (file)
@@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node,
                chip = &andes_intc_chip;
        }
 
-       return riscv_intc_init_common(of_node_to_fwnode(node), chip);
+       return riscv_intc_init_common(of_fwnode_handle(node), chip);
 }
 
 IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
index c7db617e1a2f62a9b9526cb43eb8dac93cf7fc59..7d10bf6e582437af347df216a7468e838f15dccb 100644 (file)
@@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,
                return -ENXIO;
        }
 
-       data = exiu_init(of_node_to_fwnode(node), &res);
+       data = exiu_init(of_fwnode_handle(node), &res);
        if (IS_ERR(data))
                return PTR_ERR(data);
 
index cb83d6cc6113aea157244085b00f20f04164e143..649b84f12efcf7068115a8244f1fb06458635800 100644 (file)
@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,
                if (ret)
                        return ret;
                /* we only support one parent, so far */
-               if (of_node_to_fwnode(out_irq.np) != dm->parent->fwnode)
+               if (of_fwnode_handle(out_irq.np) != dm->parent->fwnode)
                        return -EINVAL;
 
                of_phandle_args_to_fwspec(out_irq.np, out_irq.args,
index a887efba262c330699e2134620f7052457961318..38dfc1f9a56b4321bf7bf106902b6d85293a8c8b 100644 (file)
@@ -233,7 +233,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
        INIT_LIST_HEAD(&vint_desc->list);
 
        parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev));
-       parent_fwspec.fwnode = of_node_to_fwnode(parent_node);
+       parent_fwspec.fwnode = of_fwnode_handle(parent_node);
 
        if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
                /* Parent is GIC */
@@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       msi_domain = ti_sci_inta_msi_create_irq_domain(of_node_to_fwnode(node),
+       msi_domain = ti_sci_inta_msi_create_irq_domain(of_fwnode_handle(node),
                                                &ti_sci_inta_msi_domain_info,
                                                domain);
        if (!msi_domain) {
index b49a73106c69c3b2a159280d651a7de6adec7c02..686a8f69fd9c3519719a4904980690378f1c1e40 100644 (file)
@@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
                goto err_irqs;
 
        parent_node = of_irq_find_parent(dev_of_node(intr->dev));
-       fwspec.fwnode = of_node_to_fwnode(parent_node);
+       fwspec.fwnode = of_fwnode_handle(parent_node);
 
        if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
                /* Parent is GIC */
index 601f9343d5b369afebea30e1827d3c3f52ca40e7..6005c2d28dd9389ae2da6e6258eaef085152ad53 100644 (file)
@@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev)
        priv->domain = irq_domain_create_hierarchy(
                                        parent_domain, 0,
                                        UNIPHIER_AIDET_NR_IRQS,
-                                       of_node_to_fwnode(dev->of_node),
+                                       of_fwnode_handle(dev->of_node),
                                        &uniphier_aidet_domain_ops, priv);
        if (!priv->domain)
                return -ENOMEM;