diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2020-01-06 17:13:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-07 03:30:14 +0100 |
| commit | 8b4db28914b5b49e296884739d9710aedb2c368e (patch) | |
| tree | 871b654479f9a1082b067202100b38a4821bba53 /drivers/net/dsa | |
| parent | net: dsa: mv88e6xxx: Unique SERDES interrupt names (diff) | |
| download | linux-8b4db28914b5b49e296884739d9710aedb2c368e.tar.xz linux-8b4db28914b5b49e296884739d9710aedb2c368e.zip | |
net: dsa: mv88e6xxx: Unique watchdog IRQ name
Dynamically generate a unique watchdog 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/net/dsa')
| -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 b7613ef600d2..3558c677e1d3 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -296,6 +296,7 @@ struct mv88e6xxx_chip { char irq_name[32]; int device_irq; int watchdog_irq; + char watchdog_irq_name[32]; int atu_prob_irq; int vtu_prob_irq; diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c index 87bfe7c8c9cd..617174e94faa 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -948,10 +948,13 @@ static int mv88e6xxx_g2_watchdog_setup(struct mv88e6xxx_chip *chip) if (chip->watchdog_irq < 0) return chip->watchdog_irq; + snprintf(chip->watchdog_irq_name, sizeof(chip->watchdog_irq_name), + "mv88e6xxx-%s-watchdog", dev_name(chip->dev)); + err = request_threaded_irq(chip->watchdog_irq, NULL, mv88e6xxx_g2_watchdog_thread_fn, IRQF_ONESHOT | IRQF_TRIGGER_FALLING, - "mv88e6xxx-watchdog", chip); + chip->watchdog_irq_name, chip); if (err) return err; |