Commit 8b4db289 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Unique watchdog IRQ name 



Dynamically generate a unique watchdog 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 e6f2f6b8

drivers/net/dsa/mv88e6xxx/chip.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/dsa/mv88e6xxx/global2.c

+4 −1
Original line number Diff line number Diff line
@@ -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;