Commit 3095383a authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller

net: dsa: mv88e6xxx: Unique IRQ name

Dynamically generate a unique switch interrupt name, based on the
device name.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50d31037
...@@ -340,11 +340,14 @@ static int mv88e6xxx_g1_irq_setup(struct mv88e6xxx_chip *chip) ...@@ -340,11 +340,14 @@ static int mv88e6xxx_g1_irq_setup(struct mv88e6xxx_chip *chip)
*/ */
irq_set_lockdep_class(chip->irq, &lock_key, &request_key); irq_set_lockdep_class(chip->irq, &lock_key, &request_key);
snprintf(chip->irq_name, sizeof(chip->irq_name),
"mv88e6xxx-%s", dev_name(chip->dev));
mv88e6xxx_reg_unlock(chip); mv88e6xxx_reg_unlock(chip);
err = request_threaded_irq(chip->irq, NULL, err = request_threaded_irq(chip->irq, NULL,
mv88e6xxx_g1_irq_thread_fn, mv88e6xxx_g1_irq_thread_fn,
IRQF_ONESHOT | IRQF_SHARED, IRQF_ONESHOT | IRQF_SHARED,
dev_name(chip->dev), chip); chip->irq_name, chip);
mv88e6xxx_reg_lock(chip); mv88e6xxx_reg_lock(chip);
if (err) if (err)
mv88e6xxx_g1_irq_free_common(chip); mv88e6xxx_g1_irq_free_common(chip);
......
...@@ -292,6 +292,7 @@ struct mv88e6xxx_chip { ...@@ -292,6 +292,7 @@ struct mv88e6xxx_chip {
struct mv88e6xxx_irq g1_irq; struct mv88e6xxx_irq g1_irq;
struct mv88e6xxx_irq g2_irq; struct mv88e6xxx_irq g2_irq;
int irq; int irq;
char irq_name[32];
int device_irq; int device_irq;
int watchdog_irq; int watchdog_irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment