Skip to content

Commit e0c27a8

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
authored andcommitted
net: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter. Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW). [ tglx: Fix up subject prefix ] Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent d856688 commit e0c27a8

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

drivers/net/dsa/microchip/ksz_common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2697,8 +2697,9 @@ static int ksz_irq_common_setup(struct ksz_device *dev, struct ksz_irq *kirq)
26972697
kirq->dev = dev;
26982698
kirq->masked = ~0;
26992699

2700-
kirq->domain = irq_domain_add_simple(dev->dev->of_node, kirq->nirqs, 0,
2701-
&ksz_irq_domain_ops, kirq);
2700+
kirq->domain = irq_domain_create_simple(of_fwnode_handle(dev->dev->of_node),
2701+
kirq->nirqs, 0,
2702+
&ksz_irq_domain_ops, kirq);
27022703
if (!kirq->domain)
27032704
return -ENOMEM;
27042705

drivers/net/dsa/microchip/ksz_ptp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,8 +1136,8 @@ int ksz_ptp_irq_setup(struct dsa_switch *ds, u8 p)
11361136

11371137
init_completion(&port->tstamp_msg_comp);
11381138

1139-
ptpirq->domain = irq_domain_add_linear(dev->dev->of_node, ptpirq->nirqs,
1140-
&ksz_ptp_irq_domain_ops, ptpirq);
1139+
ptpirq->domain = irq_domain_create_linear(of_fwnode_handle(dev->dev->of_node),
1140+
ptpirq->nirqs, &ksz_ptp_irq_domain_ops, ptpirq);
11411141
if (!ptpirq->domain)
11421142
return -ENOMEM;
11431143

drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ static int mv88e6xxx_g1_irq_setup_common(struct mv88e6xxx_chip *chip)
297297
u16 reg, mask;
298298

299299
chip->g1_irq.nirqs = chip->info->g1_irqs;
300-
chip->g1_irq.domain = irq_domain_add_simple(
300+
chip->g1_irq.domain = irq_domain_create_simple(
301301
NULL, chip->g1_irq.nirqs, 0,
302302
&mv88e6xxx_g1_irq_domain_ops, chip);
303303
if (!chip->g1_irq.domain)

drivers/net/dsa/mv88e6xxx/global2.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,8 +1154,10 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)
11541154
if (err)
11551155
return err;
11561156

1157-
chip->g2_irq.domain = irq_domain_add_simple(
1158-
chip->dev->of_node, 16, 0, &mv88e6xxx_g2_irq_domain_ops, chip);
1157+
chip->g2_irq.domain = irq_domain_create_simple(of_fwnode_handle(chip->dev->of_node),
1158+
16, 0,
1159+
&mv88e6xxx_g2_irq_domain_ops,
1160+
chip);
11591161
if (!chip->g2_irq.domain)
11601162
return -ENOMEM;
11611163

drivers/net/dsa/qca/ar9331.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,8 +821,8 @@ static int ar9331_sw_irq_init(struct ar9331_sw_priv *priv)
821821
return ret;
822822
}
823823

824-
priv->irqdomain = irq_domain_add_linear(np, 1, &ar9331_sw_irqdomain_ops,
825-
priv);
824+
priv->irqdomain = irq_domain_create_linear(of_fwnode_handle(np), 1,
825+
&ar9331_sw_irqdomain_ops, priv);
826826
if (!priv->irqdomain) {
827827
dev_err(dev, "failed to create IRQ domain\n");
828828
return -EINVAL;

drivers/net/dsa/realtek/rtl8365mb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,8 +1719,8 @@ static int rtl8365mb_irq_setup(struct realtek_priv *priv)
17191719
goto out_put_node;
17201720
}
17211721

1722-
priv->irqdomain = irq_domain_add_linear(intc, priv->num_ports,
1723-
&rtl8365mb_irqdomain_ops, priv);
1722+
priv->irqdomain = irq_domain_create_linear(of_fwnode_handle(intc), priv->num_ports,
1723+
&rtl8365mb_irqdomain_ops, priv);
17241724
if (!priv->irqdomain) {
17251725
dev_err(priv->dev, "failed to add irq domain\n");
17261726
ret = -ENOMEM;

drivers/net/dsa/realtek/rtl8366rb.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,10 +550,8 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_priv *priv)
550550
dev_err(priv->dev, "unable to request irq: %d\n", ret);
551551
goto out_put_node;
552552
}
553-
priv->irqdomain = irq_domain_add_linear(intc,
554-
RTL8366RB_NUM_INTERRUPT,
555-
&rtl8366rb_irqdomain_ops,
556-
priv);
553+
priv->irqdomain = irq_domain_create_linear(of_fwnode_handle(intc), RTL8366RB_NUM_INTERRUPT,
554+
&rtl8366rb_irqdomain_ops, priv);
557555
if (!priv->irqdomain) {
558556
dev_err(priv->dev, "failed to create IRQ domain\n");
559557
ret = -EINVAL;

drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe)
184184
goto skip_sp_irq;
185185

186186
txgbe->misc.nirqs = 1;
187-
txgbe->misc.domain = irq_domain_add_simple(NULL, txgbe->misc.nirqs, 0,
188-
&txgbe_misc_irq_domain_ops, txgbe);
187+
txgbe->misc.domain = irq_domain_create_simple(NULL, txgbe->misc.nirqs, 0,
188+
&txgbe_misc_irq_domain_ops, txgbe);
189189
if (!txgbe->misc.domain)
190190
return -ENOMEM;
191191

drivers/net/usb/lan78xx.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2456,14 +2456,11 @@ static struct irq_chip lan78xx_irqchip = {
24562456

24572457
static int lan78xx_setup_irq_domain(struct lan78xx_net *dev)
24582458
{
2459-
struct device_node *of_node;
24602459
struct irq_domain *irqdomain;
24612460
unsigned int irqmap = 0;
24622461
u32 buf;
24632462
int ret = 0;
24642463

2465-
of_node = dev->udev->dev.parent->of_node;
2466-
24672464
mutex_init(&dev->domain_data.irq_lock);
24682465

24692466
ret = lan78xx_read_reg(dev, INT_EP_CTL, &buf);
@@ -2475,8 +2472,10 @@ static int lan78xx_setup_irq_domain(struct lan78xx_net *dev)
24752472
dev->domain_data.irqchip = &lan78xx_irqchip;
24762473
dev->domain_data.irq_handler = handle_simple_irq;
24772474

2478-
irqdomain = irq_domain_add_simple(of_node, MAX_INT_EP, 0,
2479-
&chip_domain_ops, &dev->domain_data);
2475+
irqdomain = irq_domain_create_simple(of_fwnode_handle(dev->udev->dev.parent->of_node),
2476+
MAX_INT_EP, 0,
2477+
&chip_domain_ops,
2478+
&dev->domain_data);
24802479
if (irqdomain) {
24812480
/* create mapping for PHY interrupt */
24822481
irqmap = irq_create_mapping(irqdomain, INT_EP_PHY);

0 commit comments

Comments
 (0)