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>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index b7613ef600d275b321fb64eeb9a51227333997e1..3558c677e1d3c2140d4c16ad026eb46a7d1210e5 100644 (file)
--- 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 87bfe7c8c9cda13ef41cce125ee3bd282063e0a2..617174e94faa1d38b50176ad0986e248415c8c86 100644 (file)
--- 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;