Skip to content

Commit 93174c0

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
Jiri Slaby (SUSE)
authored and
KAGA-KOKO
committed
irqchip: Use dev_fwnode()
irq_domain_create_simple() takes a fwnode as the first argument. It can be extracted from struct device using the dev_fwnode() helper instead of using of_node with of_fwnode_handle(). So use the dev_fwnode() helper. Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20250611104348.192092-10-jirislaby@kernel.org
1 parent 19272b3 commit 93174c0

14 files changed

Lines changed: 20 additions & 28 deletions

‎drivers/irqchip/irq-imgpdc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ static int pdc_intc_probe(struct platform_device *pdev)
372372
priv->syswake_irq = irq;
373373

374374
/* Set up an IRQ domain */
375-
priv->domain = irq_domain_create_linear(of_fwnode_handle(node), 16, &irq_generic_chip_ops,
376-
priv);
375+
priv->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), 16, &irq_generic_chip_ops,
376+
priv);
377377
if (unlikely(!priv->domain)) {
378378
dev_err(&pdev->dev, "cannot add IRQ domain\n");
379379
return -ENOMEM;

‎drivers/irqchip/irq-imx-irqsteer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ static int imx_irqsteer_probe(struct platform_device *pdev)
212212
/* steer all IRQs into configured channel */
213213
writel_relaxed(BIT(data->channel), data->regs + CHANCTRL);
214214

215-
data->domain = irq_domain_create_linear(of_fwnode_handle(np), data->reg_num * 32,
216-
&imx_irqsteer_domain_ops, data);
215+
data->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), data->reg_num * 32,
216+
&imx_irqsteer_domain_ops, data);
217217
if (!data->domain) {
218218
dev_err(&pdev->dev, "failed to create IRQ domain\n");
219219
ret = -ENOMEM;

‎drivers/irqchip/irq-keystone.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ static int keystone_irq_probe(struct platform_device *pdev)
157157
kirq->chip.irq_mask = keystone_irq_setmask;
158158
kirq->chip.irq_unmask = keystone_irq_unmask;
159159

160-
kirq->irqd = irq_domain_create_linear(of_fwnode_handle(np), KEYSTONE_N_IRQ,
161-
&keystone_irq_ops, kirq);
160+
kirq->irqd = irq_domain_create_linear(dev_fwnode(dev), KEYSTONE_N_IRQ, &keystone_irq_ops,
161+
kirq);
162162
if (!kirq->irqd) {
163163
dev_err(dev, "IRQ domain registration failed\n");
164164
return -ENODEV;

‎drivers/irqchip/irq-mvebu-pic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static int mvebu_pic_probe(struct platform_device *pdev)
150150
return -EINVAL;
151151
}
152152

153-
pic->domain = irq_domain_create_linear(of_fwnode_handle(node), PIC_MAX_IRQS,
153+
pic->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), PIC_MAX_IRQS,
154154
&mvebu_pic_domain_ops, pic);
155155
if (!pic->domain) {
156156
dev_err(&pdev->dev, "Failed to allocate irq domain\n");

‎drivers/irqchip/irq-pruss-intc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ static int pruss_intc_probe(struct platform_device *pdev)
555555

556556
mutex_init(&intc->lock);
557557

558-
intc->domain = irq_domain_create_linear(of_fwnode_handle(dev->of_node), max_system_events,
558+
intc->domain = irq_domain_create_linear(dev_fwnode(dev), max_system_events,
559559
&pruss_intc_irq_domain_ops, intc);
560560
if (!intc->domain)
561561
return -ENOMEM;

‎drivers/irqchip/irq-renesas-intc-irqpin.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,8 @@ static int intc_irqpin_probe(struct platform_device *pdev)
513513
irq_chip->irq_set_wake = intc_irqpin_irq_set_wake;
514514
irq_chip->flags = IRQCHIP_MASK_ON_SUSPEND;
515515

516-
p->irq_domain = irq_domain_create_simple(of_fwnode_handle(dev->of_node),
517-
nirqs, 0,
518-
&intc_irqpin_irq_domain_ops,
519-
p);
516+
p->irq_domain = irq_domain_create_simple(dev_fwnode(dev), nirqs, 0,
517+
&intc_irqpin_irq_domain_ops, p);
520518
if (!p->irq_domain) {
521519
ret = -ENXIO;
522520
dev_err(dev, "cannot initialize irq domain\n");

‎drivers/irqchip/irq-renesas-irqc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static int irqc_probe(struct platform_device *pdev)
168168

169169
p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */
170170

171-
p->irq_domain = irq_domain_create_linear(of_fwnode_handle(dev->of_node), p->number_of_irqs,
171+
p->irq_domain = irq_domain_create_linear(dev_fwnode(dev), p->number_of_irqs,
172172
&irq_generic_chip_ops, p);
173173
if (!p->irq_domain) {
174174
ret = -ENXIO;

‎drivers/irqchip/irq-renesas-rza1.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,8 @@ static int rza1_irqc_probe(struct platform_device *pdev)
231231
priv->chip.irq_set_type = rza1_irqc_set_type;
232232
priv->chip.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE;
233233

234-
priv->irq_domain = irq_domain_create_hierarchy(parent, 0, IRQC_NUM_IRQ,
235-
of_fwnode_handle(np), &rza1_irqc_domain_ops,
236-
priv);
234+
priv->irq_domain = irq_domain_create_hierarchy(parent, 0, IRQC_NUM_IRQ, dev_fwnode(dev),
235+
&rza1_irqc_domain_ops, priv);
237236
if (!priv->irq_domain) {
238237
dev_err(dev, "cannot initialize irq domain\n");
239238
ret = -ENOMEM;

‎drivers/irqchip/irq-renesas-rzg2l.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,8 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *
574574

575575
raw_spin_lock_init(&rzg2l_irqc_data->lock);
576576

577-
irq_domain = irq_domain_create_hierarchy(parent_domain, 0, IRQC_NUM_IRQ,
578-
of_fwnode_handle(node), &rzg2l_irqc_domain_ops,
579-
rzg2l_irqc_data);
577+
irq_domain = irq_domain_create_hierarchy(parent_domain, 0, IRQC_NUM_IRQ, dev_fwnode(dev),
578+
&rzg2l_irqc_domain_ops, rzg2l_irqc_data);
580579
if (!irq_domain) {
581580
pm_runtime_put(dev);
582581
return dev_err_probe(dev, -ENOMEM, "failed to add irq domain\n");

‎drivers/irqchip/irq-renesas-rzv2h.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ static int rzv2h_icu_init_common(struct device_node *node, struct device_node *p
558558
raw_spin_lock_init(&rzv2h_icu_data->lock);
559559

560560
irq_domain = irq_domain_create_hierarchy(parent_domain, 0, ICU_NUM_IRQ,
561-
of_fwnode_handle(node), &rzv2h_icu_domain_ops,
561+
dev_fwnode(&pdev->dev), &rzv2h_icu_domain_ops,
562562
rzv2h_icu_data);
563563
if (!irq_domain) {
564564
dev_err(&pdev->dev, "failed to add irq domain\n");

0 commit comments

Comments
 (0)