diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2020-01-06 17:13:51 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-06 18:30:14 -0800 |
| commit | 06acd1148bb35a0c4144fec0a97685974dc89e61 (patch) | |
| tree | c46a53dba87c83baf69cddffda644b4370be2e27 /drivers | |
| parent | net: dsa: mv88e6xxx: Unique watchdog IRQ name (diff) | |
| download | linux-dev-06acd1148bb35a0c4144fec0a97685974dc89e61.tar.xz linux-dev-06acd1148bb35a0c4144fec0a97685974dc89e61.zip | |
net: dsa: mv88e6xxx: Unique g2 IRQ name
Dynamically generate a unique g2 interrupt name, based on the
device name.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.h | 1 | ||||
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/global2.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h index 3558c677e1d3..47fd909fccc2 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -295,6 +295,7 @@ struct mv88e6xxx_chip { int irq; char irq_name[32]; int device_irq; + char device_irq_name[32]; int watchdog_irq; char watchdog_irq_name[32]; diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c index 617174e94faa..01503014b1ee 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -1117,9 +1117,12 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip) goto out; } + snprintf(chip->device_irq_name, sizeof(chip->device_irq_name), + "mv88e6xxx-%s-g2", dev_name(chip->dev)); + err = request_threaded_irq(chip->device_irq, NULL, mv88e6xxx_g2_irq_thread_fn, - IRQF_ONESHOT, "mv88e6xxx-g2", chip); + IRQF_ONESHOT, chip->device_irq_name, chip); if (err) goto out; |