renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-10 22:54:11 +08:00
Code

net: dsa: mv88e6xxx: Unique watchdog IRQ name

Browse Source 
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>
This commit is contained in:
Andrew Lunn 2020-01-06 17:13:50 +01:00 committed by David S. Miller
parent e6f2f6b824
commit 8b4db28914
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/dsa/mv88e6xxx/chip.h
View File

@ -296,6 +296,7 @@ struct mv88e6xxx_chip {
char irq_name[32]; char irq_name[32];
int device_irq; int device_irq;
int watchdog_irq; int watchdog_irq;
char watchdog_irq_name[32];
int atu_prob_irq; int atu_prob_irq;
int vtu_prob_irq; int vtu_prob_irq;

5
drivers/net/dsa/mv88e6xxx/global2.c
View File

@ -948,10 +948,13 @@ static int mv88e6xxx_g2_watchdog_setup(struct mv88e6xxx_chip *chip)
if (chip->watchdog_irq < 0) if (chip->watchdog_irq < 0)
return chip->watchdog_irq; 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, err = request_threaded_irq(chip->watchdog_irq, NULL,
mv88e6xxx_g2_watchdog_thread_fn, mv88e6xxx_g2_watchdog_thread_fn,
IRQF_ONESHOT | IRQF_TRIGGER_FALLING, IRQF_ONESHOT | IRQF_TRIGGER_FALLING,
"mv88e6xxx-watchdog", chip); chip->watchdog_irq_name, chip);
if (err) if (err)
return err; return err;