Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irqchip: Switch to of_fwnode_handle()

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


authored by

Jiri Slaby (SUSE) and committed by
Thomas Gleixner
87228532 8288eac5

+26 -26
+1 -1
drivers/irqchip/irq-alpine-msi.c
··· 213 213 return -ENOMEM; 214 214 } 215 215 216 - msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), 216 + msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), 217 217 &alpine_msix_domain_info, 218 218 middle_domain); 219 219 if (!msi_domain) {
+2 -2
drivers/irqchip/irq-apple-aic.c
··· 1014 1014 1015 1015 irqc->info.die_stride = off - start_off; 1016 1016 1017 - irqc->hw_domain = irq_domain_create_tree(of_node_to_fwnode(node), 1017 + irqc->hw_domain = irq_domain_create_tree(of_fwnode_handle(node), 1018 1018 &aic_irq_domain_ops, irqc); 1019 1019 if (WARN_ON(!irqc->hw_domain)) 1020 1020 goto err_unmap; ··· 1067 1067 1068 1068 if (is_kernel_in_hyp_mode()) { 1069 1069 struct irq_fwspec mi = { 1070 - .fwnode = of_node_to_fwnode(node), 1070 + .fwnode = of_fwnode_handle(node), 1071 1071 .param_count = 3, 1072 1072 .param = { 1073 1073 [0] = AIC_FIQ, /* This is a lie */
+2 -2
drivers/irqchip/irq-armada-370-xp.c
··· 353 353 if (!mpic->msi_inner_domain) 354 354 return -ENOMEM; 355 355 356 - mpic->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), &mpic_msi_domain_info, 356 + mpic->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), &mpic_msi_domain_info, 357 357 mpic->msi_inner_domain); 358 358 if (!mpic->msi_domain) { 359 359 irq_domain_remove(mpic->msi_inner_domain); ··· 492 492 { 493 493 int base_ipi; 494 494 495 - mpic->ipi_domain = irq_domain_create_linear(of_node_to_fwnode(node), IPI_DOORBELL_NR, 495 + mpic->ipi_domain = irq_domain_create_linear(of_fwnode_handle(node), IPI_DOORBELL_NR, 496 496 &mpic_ipi_domain_ops, mpic); 497 497 if (WARN_ON(!mpic->ipi_domain)) 498 498 return -ENOMEM;
+1 -1
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
··· 152 152 if (!of_property_read_bool(np, "msi-controller")) 153 153 continue; 154 154 155 - its_fsl_mc_msi_init_one(of_node_to_fwnode(np), 155 + its_fsl_mc_msi_init_one(of_fwnode_handle(np), 156 156 np->full_name); 157 157 } 158 158 }
+2 -2
drivers/irqchip/irq-gic-v3.c
··· 1826 1826 1827 1827 ppi_idx = __gic_get_ppi_index(ppi_intid); 1828 1828 ret = partition_translate_id(gic_data.ppi_descs[ppi_idx], 1829 - of_node_to_fwnode(np)); 1829 + of_fwnode_handle(np)); 1830 1830 if (ret < 0) 1831 1831 return ret; 1832 1832 ··· 2192 2192 2193 2193 part = &parts[part_idx]; 2194 2194 2195 - part->partition_id = of_node_to_fwnode(child_part); 2195 + part->partition_id = of_fwnode_handle(child_part); 2196 2196 2197 2197 pr_info("GIC: PPI partition %pOFn[%d] { ", 2198 2198 child_part, part_idx);
+1 -1
drivers/irqchip/irq-ixp4xx.c
··· 261 261 pr_crit("IXP4XX: could not ioremap interrupt controller\n"); 262 262 return -ENODEV; 263 263 } 264 - fwnode = of_node_to_fwnode(np); 264 + fwnode = of_fwnode_handle(np); 265 265 266 266 /* These chip variants have 64 interrupts */ 267 267 is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||
+1 -1
drivers/irqchip/irq-lan966x-oic.c
··· 224 224 .exit = lan966x_oic_chip_exit, 225 225 }; 226 226 struct irq_domain_info d_info = { 227 - .fwnode = of_node_to_fwnode(pdev->dev.of_node), 227 + .fwnode = of_fwnode_handle(pdev->dev.of_node), 228 228 .domain_flags = IRQ_DOMAIN_FLAG_DESTROY_GC, 229 229 .size = LAN966X_OIC_NR_IRQ, 230 230 .hwirq_max = LAN966X_OIC_NR_IRQ,
+1 -1
drivers/irqchip/irq-loongarch-cpu.c
··· 100 100 static int __init cpuintc_of_init(struct device_node *of_node, 101 101 struct device_node *parent) 102 102 { 103 - cpuintc_handle = of_node_to_fwnode(of_node); 103 + cpuintc_handle = of_fwnode_handle(of_node); 104 104 105 105 irq_domain = irq_domain_create_linear(cpuintc_handle, EXCCODE_INT_NUM, 106 106 &loongarch_cpu_intc_irq_domain_ops, NULL);
+1 -1
drivers/irqchip/irq-loongson-eiointc.c
··· 554 554 priv->vec_count = VEC_COUNT; 555 555 556 556 priv->node = 0; 557 - priv->domain_handle = of_node_to_fwnode(of_node); 557 + priv->domain_handle = of_fwnode_handle(of_node); 558 558 559 559 ret = eiointc_init(priv, parent_irq, 0); 560 560 if (ret < 0)
+1 -1
drivers/irqchip/irq-loongson-htvec.c
··· 248 248 } 249 249 250 250 err = htvec_init(res.start, resource_size(&res), 251 - num_parents, parent_irq, of_node_to_fwnode(node)); 251 + num_parents, parent_irq, of_fwnode_handle(node)); 252 252 if (err < 0) 253 253 return err; 254 254
+1 -1
drivers/irqchip/irq-loongson-liointc.c
··· 363 363 } 364 364 365 365 err = liointc_init(res.start, resource_size(&res), 366 - revision, of_node_to_fwnode(node), node); 366 + revision, of_fwnode_handle(node), node); 367 367 if (err < 0) 368 368 return err; 369 369
+1 -1
drivers/irqchip/irq-loongson-pch-msi.c
··· 243 243 return -EINVAL; 244 244 } 245 245 246 - err = pch_msi_init(res.start, irq_base, irq_count, parent_domain, of_node_to_fwnode(node)); 246 + err = pch_msi_init(res.start, irq_base, irq_count, parent_domain, of_fwnode_handle(node)); 247 247 if (err < 0) 248 248 return err; 249 249
+1 -1
drivers/irqchip/irq-loongson-pch-pic.c
··· 392 392 } 393 393 394 394 err = pch_pic_init(res.start, resource_size(&res), vec_base, 395 - parent_domain, of_node_to_fwnode(node), 0); 395 + parent_domain, of_fwnode_handle(node), 0); 396 396 if (err < 0) 397 397 return err; 398 398
+1 -1
drivers/irqchip/irq-ls-scfg-msi.c
··· 225 225 } 226 226 227 227 msi_data->msi_domain = pci_msi_create_irq_domain( 228 - of_node_to_fwnode(msi_data->pdev->dev.of_node), 228 + of_fwnode_handle(msi_data->pdev->dev.of_node), 229 229 &ls_scfg_msi_domain_info, 230 230 msi_data->parent); 231 231 if (!msi_data->msi_domain) {
+1 -1
drivers/irqchip/irq-meson-gpio.c
··· 607 607 608 608 domain = irq_domain_create_hierarchy(parent_domain, 0, 609 609 ctl->params->nr_hwirq, 610 - of_node_to_fwnode(node), 610 + of_fwnode_handle(node), 611 611 &meson_gpio_irq_domain_ops, 612 612 ctl); 613 613 if (!domain) {
+1 -1
drivers/irqchip/irq-qcom-mpm.c
··· 447 447 448 448 priv->domain = irq_domain_create_hierarchy(parent_domain, 449 449 IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP, pin_cnt, 450 - of_node_to_fwnode(np), &qcom_mpm_ops, priv); 450 + of_fwnode_handle(np), &qcom_mpm_ops, priv); 451 451 if (!priv->domain) { 452 452 dev_err(dev, "failed to create MPM domain\n"); 453 453 ret = -ENOMEM;
+1 -1
drivers/irqchip/irq-riscv-intc.c
··· 242 242 chip = &andes_intc_chip; 243 243 } 244 244 245 - return riscv_intc_init_common(of_node_to_fwnode(node), chip); 245 + return riscv_intc_init_common(of_fwnode_handle(node), chip); 246 246 } 247 247 248 248 IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);
+1 -1
drivers/irqchip/irq-sni-exiu.c
··· 249 249 return -ENXIO; 250 250 } 251 251 252 - data = exiu_init(of_node_to_fwnode(node), &res); 252 + data = exiu_init(of_fwnode_handle(node), &res); 253 253 if (IS_ERR(data)) 254 254 return PTR_ERR(data); 255 255
+1 -1
drivers/irqchip/irq-stm32mp-exti.c
··· 531 531 if (ret) 532 532 return ret; 533 533 /* we only support one parent, so far */ 534 - if (of_node_to_fwnode(out_irq.np) != dm->parent->fwnode) 534 + if (of_fwnode_handle(out_irq.np) != dm->parent->fwnode) 535 535 return -EINVAL; 536 536 537 537 of_phandle_args_to_fwspec(out_irq.np, out_irq.args,
+2 -2
drivers/irqchip/irq-ti-sci-inta.c
··· 233 233 INIT_LIST_HEAD(&vint_desc->list); 234 234 235 235 parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev)); 236 - parent_fwspec.fwnode = of_node_to_fwnode(parent_node); 236 + parent_fwspec.fwnode = of_fwnode_handle(parent_node); 237 237 238 238 if (of_device_is_compatible(parent_node, "arm,gic-v3")) { 239 239 /* Parent is GIC */ ··· 709 709 return -ENOMEM; 710 710 } 711 711 712 - msi_domain = ti_sci_inta_msi_create_irq_domain(of_node_to_fwnode(node), 712 + msi_domain = ti_sci_inta_msi_create_irq_domain(of_fwnode_handle(node), 713 713 &ti_sci_inta_msi_domain_info, 714 714 domain); 715 715 if (!msi_domain) {
+1 -1
drivers/irqchip/irq-ti-sci-intr.c
··· 149 149 goto err_irqs; 150 150 151 151 parent_node = of_irq_find_parent(dev_of_node(intr->dev)); 152 - fwspec.fwnode = of_node_to_fwnode(parent_node); 152 + fwspec.fwnode = of_fwnode_handle(parent_node); 153 153 154 154 if (of_device_is_compatible(parent_node, "arm,gic-v3")) { 155 155 /* Parent is GIC */
+1 -1
drivers/irqchip/irq-uniphier-aidet.c
··· 188 188 priv->domain = irq_domain_create_hierarchy( 189 189 parent_domain, 0, 190 190 UNIPHIER_AIDET_NR_IRQS, 191 - of_node_to_fwnode(dev->of_node), 191 + of_fwnode_handle(dev->of_node), 192 192 &uniphier_aidet_domain_ops, priv); 193 193 if (!priv->domain) 194 194 return -ENOMEM;