superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/1250/head
Jiri Slaby (SUSE) 2025-03-19 10:28:59 +01:00 committed by Thomas Gleixner
parent 8288eac57d
commit 87228532e7
22 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/irqchip/irq-alpine-msi.c
View File

@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,
return -ENOMEM; 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, &alpine_msix_domain_info,
middle_domain); middle_domain);
if (!msi_domain) { if (!msi_domain) {

4
drivers/irqchip/irq-apple-aic.c
View 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->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); &aic_irq_domain_ops, irqc);
if (WARN_ON(!irqc->hw_domain)) if (WARN_ON(!irqc->hw_domain))
goto err_unmap; 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()) { if (is_kernel_in_hyp_mode()) {
struct irq_fwspec mi = { struct irq_fwspec mi = {
.fwnode = of_node_to_fwnode(node), .fwnode = of_fwnode_handle(node),
.param_count = 3, .param_count = 3,
.param = { .param = {
[0] = AIC_FIQ, /* This is a lie */ [0] = AIC_FIQ, /* This is a lie */

4
drivers/irqchip/irq-armada-370-xp.c
View File

@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,
if (!mpic->msi_inner_domain) if (!mpic->msi_inner_domain)
return -ENOMEM; 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); mpic->msi_inner_domain);
if (!mpic->msi_domain) { if (!mpic->msi_domain) {
irq_domain_remove(mpic->msi_inner_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; 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); &mpic_ipi_domain_ops, mpic);
if (WARN_ON(!mpic->ipi_domain)) if (WARN_ON(!mpic->ipi_domain))
return -ENOMEM; return -ENOMEM;

2
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
View File

@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)
if (!of_property_read_bool(np, "msi-controller")) if (!of_property_read_bool(np, "msi-controller"))
continue; 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); np->full_name);
} }
} }

4
drivers/irqchip/irq-gic-v3.c
View File

@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d,
ppi_idx = __gic_get_ppi_index(ppi_intid); ppi_idx = __gic_get_ppi_index(ppi_intid);
ret = partition_translate_id(gic_data.ppi_descs[ppi_idx], ret = partition_translate_id(gic_data.ppi_descs[ppi_idx],
of_node_to_fwnode(np)); of_fwnode_handle(np));
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
part = &parts[part_idx]; 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] { ", pr_info("GIC: PPI partition %pOFn[%d] { ",
child_part, part_idx); child_part, part_idx);

2
drivers/irqchip/irq-ixp4xx.c
View 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"); pr_crit("IXP4XX: could not ioremap interrupt controller\n");
return -ENODEV; return -ENODEV;
} }
fwnode = of_node_to_fwnode(np); fwnode = of_fwnode_handle(np);
/* These chip variants have 64 interrupts */ /* These chip variants have 64 interrupts */
is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") || is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||

2
drivers/irqchip/irq-lan966x-oic.c
View File

@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev)
.exit = lan966x_oic_chip_exit, .exit = lan966x_oic_chip_exit,
}; };
struct irq_domain_info d_info = { 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, .domain_flags = IRQ_DOMAIN_FLAG_DESTROY_GC,
.size = LAN966X_OIC_NR_IRQ, .size = LAN966X_OIC_NR_IRQ,
.hwirq_max = LAN966X_OIC_NR_IRQ, .hwirq_max = LAN966X_OIC_NR_IRQ,

2
drivers/irqchip/irq-loongarch-cpu.c
View 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, static int __init cpuintc_of_init(struct device_node *of_node,
struct device_node *parent) 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, irq_domain = irq_domain_create_linear(cpuintc_handle, EXCCODE_INT_NUM,
&loongarch_cpu_intc_irq_domain_ops, NULL); &loongarch_cpu_intc_irq_domain_ops, NULL);

2
drivers/irqchip/irq-loongson-eiointc.c
View File

@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node,
priv->vec_count = VEC_COUNT; priv->vec_count = VEC_COUNT;
priv->node = 0; 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); ret = eiointc_init(priv, parent_irq, 0);
if (ret < 0) if (ret < 0)

2
drivers/irqchip/irq-loongson-htvec.c
View File

@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node,
} }
err = htvec_init(res.start, resource_size(&res), 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) if (err < 0)
return err; return err;

2
drivers/irqchip/irq-loongson-liointc.c
View File

@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node,
} }
err = liointc_init(res.start, resource_size(&res), err = liointc_init(res.start, resource_size(&res),
revision, of_node_to_fwnode(node), node); revision, of_fwnode_handle(node), node);
if (err < 0) if (err < 0)
return err; return err;

2
drivers/irqchip/irq-loongson-pch-msi.c
View File

@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)
return -EINVAL; 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) if (err < 0)
return err; return err;

2
drivers/irqchip/irq-loongson-pch-pic.c
View 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, 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) if (err < 0)
return err; return err;

2
drivers/irqchip/irq-ls-scfg-msi.c
View 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( 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, &ls_scfg_msi_domain_info,
msi_data->parent); msi_data->parent);
if (!msi_data->msi_domain) { if (!msi_data->msi_domain) {

2
drivers/irqchip/irq-meson-gpio.c
View 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, domain = irq_domain_create_hierarchy(parent_domain, 0,
ctl->params->nr_hwirq, ctl->params->nr_hwirq,
of_node_to_fwnode(node), of_fwnode_handle(node),
&meson_gpio_irq_domain_ops, &meson_gpio_irq_domain_ops,
ctl); ctl);
if (!domain) { if (!domain) {

2
drivers/irqchip/irq-qcom-mpm.c
View 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, priv->domain = irq_domain_create_hierarchy(parent_domain,
IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP, pin_cnt, 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) { if (!priv->domain) {
dev_err(dev, "failed to create MPM domain\n"); dev_err(dev, "failed to create MPM domain\n");
ret = -ENOMEM; ret = -ENOMEM;

2
drivers/irqchip/irq-riscv-intc.c
View File

@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node,
chip = &andes_intc_chip; 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); IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init);

2
drivers/irqchip/irq-sni-exiu.c
View File

@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,
return -ENXIO; return -ENXIO;
} }
data = exiu_init(of_node_to_fwnode(node), &res); data = exiu_init(of_fwnode_handle(node), &res);
if (IS_ERR(data)) if (IS_ERR(data))
return PTR_ERR(data); return PTR_ERR(data);

2
drivers/irqchip/irq-stm32mp-exti.c
View File

@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,
if (ret) if (ret)
return ret; return ret;
/* we only support one parent, so far */ /* 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; return -EINVAL;
of_phandle_args_to_fwspec(out_irq.np, out_irq.args, of_phandle_args_to_fwspec(out_irq.np, out_irq.args,

4
drivers/irqchip/irq-ti-sci-inta.c
View 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); INIT_LIST_HEAD(&vint_desc->list);
parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev)); 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")) { if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
/* Parent is GIC */ /* Parent is GIC */
@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
return -ENOMEM; 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, &ti_sci_inta_msi_domain_info,
domain); domain);
if (!msi_domain) { if (!msi_domain) {

2
drivers/irqchip/irq-ti-sci-intr.c
View File

@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
goto err_irqs; goto err_irqs;
parent_node = of_irq_find_parent(dev_of_node(intr->dev)); 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")) { if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
/* Parent is GIC */ /* Parent is GIC */

2
drivers/irqchip/irq-uniphier-aidet.c
View File

@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev)
priv->domain = irq_domain_create_hierarchy( priv->domain = irq_domain_create_hierarchy(
parent_domain, 0, parent_domain, 0,
UNIPHIER_AIDET_NR_IRQS, UNIPHIER_AIDET_NR_IRQS,
of_node_to_fwnode(dev->of_node), of_fwnode_handle(dev->of_node),
&uniphier_aidet_domain_ops, priv); &uniphier_aidet_domain_ops, priv);
if (!priv->domain) if (!priv->domain)
return -ENOMEM; return -ENOMEM;