Commit 06acd114 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Unique g2 IRQ name 



Dynamically generate a unique g2 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 8b4db289

drivers/net/dsa/mv88e6xxx/chip.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ struct mv88e6xxx_chip { 
	int irq;

	char irq_name[32];

	int device_irq;

	char device_irq_name[32];

	int watchdog_irq;

	char watchdog_irq_name[32];

drivers/net/dsa/mv88e6xxx/global2.c

+4 −1
Original line number Diff line number Diff line
@@ -1117,9 +1117,12 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip) 
		goto out;

	}



	snprintf(chip->device_irq_name, sizeof(chip->device_irq_name),

		 "mv88e6xxx-%s-g2", dev_name(chip->dev));



	err = request_threaded_irq(chip->device_irq, NULL,

				   mv88e6xxx_g2_irq_thread_fn,

				   IRQF_ONESHOT, "mv88e6xxx-g2", chip);

				   IRQF_ONESHOT, chip->device_irq_name, chip);

	if (err)

		goto out;