Commit 8ddf0b56 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller

net: dsa: mv88e6xxx: Unique ATU and VTU IRQ names

Dynamically generate a unique interrupt name for the VTU and ATU,
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 06acd114
...@@ -300,7 +300,9 @@ struct mv88e6xxx_chip { ...@@ -300,7 +300,9 @@ struct mv88e6xxx_chip {
char watchdog_irq_name[32]; char watchdog_irq_name[32];
int atu_prob_irq; int atu_prob_irq;
char atu_prob_irq_name[32];
int vtu_prob_irq; int vtu_prob_irq;
char vtu_prob_irq_name[32];
struct kthread_worker *kworker; struct kthread_worker *kworker;
struct kthread_delayed_work irq_poll_work; struct kthread_delayed_work irq_poll_work;
......
...@@ -425,9 +425,12 @@ int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip) ...@@ -425,9 +425,12 @@ int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip)
if (chip->atu_prob_irq < 0) if (chip->atu_prob_irq < 0)
return chip->atu_prob_irq; return chip->atu_prob_irq;
snprintf(chip->atu_prob_irq_name, sizeof(chip->atu_prob_irq_name),
"mv88e6xxx-%s-g1-atu-prob", dev_name(chip->dev));
err = request_threaded_irq(chip->atu_prob_irq, NULL, err = request_threaded_irq(chip->atu_prob_irq, NULL,
mv88e6xxx_g1_atu_prob_irq_thread_fn, mv88e6xxx_g1_atu_prob_irq_thread_fn,
IRQF_ONESHOT, "mv88e6xxx-g1-atu-prob", IRQF_ONESHOT, chip->atu_prob_irq_name,
chip); chip);
if (err) if (err)
irq_dispose_mapping(chip->atu_prob_irq); irq_dispose_mapping(chip->atu_prob_irq);
......
...@@ -631,9 +631,12 @@ int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip) ...@@ -631,9 +631,12 @@ int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip)
if (chip->vtu_prob_irq < 0) if (chip->vtu_prob_irq < 0)
return chip->vtu_prob_irq; return chip->vtu_prob_irq;
snprintf(chip->vtu_prob_irq_name, sizeof(chip->vtu_prob_irq_name),
"mv88e6xxx-%s-g1-vtu-prob", dev_name(chip->dev));
err = request_threaded_irq(chip->vtu_prob_irq, NULL, err = request_threaded_irq(chip->vtu_prob_irq, NULL,
mv88e6xxx_g1_vtu_prob_irq_thread_fn, mv88e6xxx_g1_vtu_prob_irq_thread_fn,
IRQF_ONESHOT, "mv88e6xxx-g1-vtu-prob", IRQF_ONESHOT, chip->vtu_prob_irq_name,
chip); chip);
if (err) if (err)
irq_dispose_mapping(chip->vtu_prob_irq); irq_dispose_mapping(chip->vtu_prob_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