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

Commit 189e91f5 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

m32r: remove obsolete hw_interrupt_type 



The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
been kept around for migration reasons.  After more than two years it's
time to remove them finally.

This patch cleans up one of the remaining users.  When all such patches
hit mainline we can remove the defines and typedefs finally.

Impact: cleanup

Convert the last remaining users to struct irq_chip and remove the
define.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Hirokazu Takata <takata@linux-m32r.org>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb26b3e6

arch/m32r/platforms/m32104ut/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void shutdown_m32104ut_irq(unsigned int irq) 
	outl(M32R_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type m32104ut_irq_type =

static struct irq_chip m32104ut_irq_type =

{

	.typename = "M32104UT-IRQ",

	.startup = startup_m32104ut_irq,

arch/m32r/platforms/m32700ut/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void shutdown_m32700ut_irq(unsigned int irq) 
	outl(M32R_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type m32700ut_irq_type =

static struct irq_chip m32700ut_irq_type =

{

	.typename = "M32700UT-IRQ",

	.startup = startup_m32700ut_irq,
@@ -146,7 +146,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) 
	outw(PLD_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type m32700ut_pld_irq_type =

static struct irq_chip m32700ut_pld_irq_type =

{

	.typename = "M32700UT-PLD-IRQ",

	.startup = startup_m32700ut_pld_irq,
@@ -215,7 +215,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq) 
	outw(PLD_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type m32700ut_lanpld_irq_type =

static struct irq_chip m32700ut_lanpld_irq_type =

{

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

	.startup = startup_m32700ut_lanpld_irq,
@@ -284,7 +284,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq) 
	outw(PLD_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type m32700ut_lcdpld_irq_type =

static struct irq_chip m32700ut_lcdpld_irq_type =

{

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

	.startup = startup_m32700ut_lcdpld_irq,

arch/m32r/platforms/mappi/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq) 
	outl(M32R_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type mappi_irq_type =

static struct irq_chip mappi_irq_type =

{

	.typename = "MAPPI-IRQ",

	.startup = startup_mappi_irq,

arch/m32r/platforms/mappi2/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void shutdown_mappi2_irq(unsigned int irq) 
	outl(M32R_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type mappi2_irq_type =

static struct irq_chip mappi2_irq_type =

{

	.typename = "MAPPI2-IRQ",

	.startup = startup_mappi2_irq,

arch/m32r/platforms/mappi3/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void shutdown_mappi3_irq(unsigned int irq) 
	outl(M32R_ICUCR_ILEVEL7, port);

}



static struct hw_interrupt_type mappi3_irq_type =

static struct irq_chip mappi3_irq_type =

{

	.typename = "MAPPI3-IRQ",

	.startup = startup_mappi3_irq,