Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ea13c6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Cleanup irq_chip->typename leftovers 



3 years transition phase is enough. Cleanup the last users and remove
the cruft.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Leo Chen <leochen@broadcom.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Chris Zankel <chris@zankel.net>
parent a800c7cc

arch/arm/mach-bcmring/irq.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -67,21 +67,21 @@ static void bcmring_unmask_irq2(unsigned int irq) 
}

}





static struct irq_chip bcmring_irq0_chip = {

static struct irq_chip bcmring_irq0_chip = {

	.typename = "ARM-INTC0",

	.name = "ARM-INTC0",

	.ack = bcmring_mask_irq0,

	.ack = bcmring_mask_irq0,

	.mask = bcmring_mask_irq0,	/* mask a specific interrupt, blocking its delivery. */

	.mask = bcmring_mask_irq0,	/* mask a specific interrupt, blocking its delivery. */

	.unmask = bcmring_unmask_irq0,	/* unmaks an interrupt */

	.unmask = bcmring_unmask_irq0,	/* unmaks an interrupt */

};

};





static struct irq_chip bcmring_irq1_chip = {

static struct irq_chip bcmring_irq1_chip = {

	.typename = "ARM-INTC1",

	.name = "ARM-INTC1",

	.ack = bcmring_mask_irq1,

	.ack = bcmring_mask_irq1,

	.mask = bcmring_mask_irq1,

	.mask = bcmring_mask_irq1,

	.unmask = bcmring_unmask_irq1,

	.unmask = bcmring_unmask_irq1,

};

};





static struct irq_chip bcmring_irq2_chip = {

static struct irq_chip bcmring_irq2_chip = {

	.typename = "ARM-SINTC",

	.name = "ARM-SINTC",

	.ack = bcmring_mask_irq2,

	.ack = bcmring_mask_irq2,

	.mask = bcmring_mask_irq2,

	.mask = bcmring_mask_irq2,

	.unmask = bcmring_unmask_irq2,

	.unmask = bcmring_unmask_irq2,

arch/m32r/kernel/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v) 
		for_each_online_cpu(j)

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));

#endif

#endif

		seq_printf(p, " %14s", irq_desc[i].chip->typename);

		seq_printf(p, " %14s", irq_desc[i].chip->name);

		seq_printf(p, "  %s", action->name);

		seq_printf(p, "  %s", action->name);





		for (action=action->next; action; action = action->next)

		for (action=action->next; action; action = action->next)

arch/m32r/platforms/m32104ut/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static void shutdown_m32104ut_irq(unsigned int irq) 




static struct irq_chip m32104ut_irq_type =

static struct irq_chip m32104ut_irq_type =

{

{

	.typename = "M32104UT-IRQ",

	.name = "M32104UT-IRQ",

	.startup = startup_m32104ut_irq,

	.startup = startup_m32104ut_irq,

	.shutdown = shutdown_m32104ut_irq,

	.shutdown = shutdown_m32104ut_irq,

	.enable = enable_m32104ut_irq,

	.enable = enable_m32104ut_irq,

arch/m32r/platforms/m32700ut/setup.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ static void shutdown_m32700ut_irq(unsigned int irq) 




static struct irq_chip m32700ut_irq_type =

static struct irq_chip m32700ut_irq_type =

{

{

	.typename = "M32700UT-IRQ",

	.name = "M32700UT-IRQ",

	.startup = startup_m32700ut_irq,

	.startup = startup_m32700ut_irq,

	.shutdown = shutdown_m32700ut_irq,

	.shutdown = shutdown_m32700ut_irq,

	.enable = enable_m32700ut_irq,

	.enable = enable_m32700ut_irq,
@@ -148,7 +148,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) 




static struct irq_chip m32700ut_pld_irq_type =

static struct irq_chip m32700ut_pld_irq_type =

{

{

	.typename = "M32700UT-PLD-IRQ",

	.name = "M32700UT-PLD-IRQ",

	.startup = startup_m32700ut_pld_irq,

	.startup = startup_m32700ut_pld_irq,

	.shutdown = shutdown_m32700ut_pld_irq,

	.shutdown = shutdown_m32700ut_pld_irq,

	.enable = enable_m32700ut_pld_irq,

	.enable = enable_m32700ut_pld_irq,
@@ -217,7 +217,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq) 




static struct irq_chip m32700ut_lanpld_irq_type =

static struct irq_chip m32700ut_lanpld_irq_type =

{

{

	.typename = "M32700UT-PLD-LAN-IRQ",

	.name = "M32700UT-PLD-LAN-IRQ",

	.startup = startup_m32700ut_lanpld_irq,

	.startup = startup_m32700ut_lanpld_irq,

	.shutdown = shutdown_m32700ut_lanpld_irq,

	.shutdown = shutdown_m32700ut_lanpld_irq,

	.enable = enable_m32700ut_lanpld_irq,

	.enable = enable_m32700ut_lanpld_irq,
@@ -286,7 +286,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq) 




static struct irq_chip m32700ut_lcdpld_irq_type =

static struct irq_chip m32700ut_lcdpld_irq_type =

{

{

	.typename = "M32700UT-PLD-LCD-IRQ",

	.name = "M32700UT-PLD-LCD-IRQ",

	.startup = startup_m32700ut_lcdpld_irq,

	.startup = startup_m32700ut_lcdpld_irq,

	.shutdown = shutdown_m32700ut_lcdpld_irq,

	.shutdown = shutdown_m32700ut_lcdpld_irq,

	.enable = enable_m32700ut_lcdpld_irq,

	.enable = enable_m32700ut_lcdpld_irq,

arch/m32r/platforms/mappi/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static void shutdown_mappi_irq(unsigned int irq) 




static struct irq_chip mappi_irq_type =

static struct irq_chip mappi_irq_type =

{

{

	.typename = "MAPPI-IRQ",

	.name = "MAPPI-IRQ",

	.startup = startup_mappi_irq,

	.startup = startup_mappi_irq,

	.shutdown = shutdown_mappi_irq,

	.shutdown = shutdown_mappi_irq,

	.enable = enable_mappi_irq,

	.enable = enable_mappi_irq,