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

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
...@@ -63,7 +63,7 @@ static void shutdown_m32104ut_irq(unsigned int irq) ...@@ -63,7 +63,7 @@ static void shutdown_m32104ut_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type m32104ut_irq_type = static struct irq_chip m32104ut_irq_type =
{ {
.typename = "M32104UT-IRQ", .typename = "M32104UT-IRQ",
.startup = startup_m32104ut_irq, .startup = startup_m32104ut_irq,
......
...@@ -69,7 +69,7 @@ static void shutdown_m32700ut_irq(unsigned int irq) ...@@ -69,7 +69,7 @@ static void shutdown_m32700ut_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type m32700ut_irq_type = static struct irq_chip m32700ut_irq_type =
{ {
.typename = "M32700UT-IRQ", .typename = "M32700UT-IRQ",
.startup = startup_m32700ut_irq, .startup = startup_m32700ut_irq,
...@@ -146,7 +146,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) ...@@ -146,7 +146,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); 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", .typename = "M32700UT-PLD-IRQ",
.startup = startup_m32700ut_pld_irq, .startup = startup_m32700ut_pld_irq,
...@@ -215,7 +215,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq) ...@@ -215,7 +215,7 @@ static void shutdown_m32700ut_lanpld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); 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", .typename = "M32700UT-PLD-LAN-IRQ",
.startup = startup_m32700ut_lanpld_irq, .startup = startup_m32700ut_lanpld_irq,
...@@ -284,7 +284,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq) ...@@ -284,7 +284,7 @@ static void shutdown_m32700ut_lcdpld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); 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", .typename = "M32700UT-PLD-LCD-IRQ",
.startup = startup_m32700ut_lcdpld_irq, .startup = startup_m32700ut_lcdpld_irq,
......
...@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq) ...@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type mappi_irq_type = static struct irq_chip mappi_irq_type =
{ {
.typename = "MAPPI-IRQ", .typename = "MAPPI-IRQ",
.startup = startup_mappi_irq, .startup = startup_mappi_irq,
......
...@@ -70,7 +70,7 @@ static void shutdown_mappi2_irq(unsigned int irq) ...@@ -70,7 +70,7 @@ static void shutdown_mappi2_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type mappi2_irq_type = static struct irq_chip mappi2_irq_type =
{ {
.typename = "MAPPI2-IRQ", .typename = "MAPPI2-IRQ",
.startup = startup_mappi2_irq, .startup = startup_mappi2_irq,
......
...@@ -70,7 +70,7 @@ static void shutdown_mappi3_irq(unsigned int irq) ...@@ -70,7 +70,7 @@ static void shutdown_mappi3_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type mappi3_irq_type = static struct irq_chip mappi3_irq_type =
{ {
.typename = "MAPPI3-IRQ", .typename = "MAPPI3-IRQ",
.startup = startup_mappi3_irq, .startup = startup_mappi3_irq,
......
...@@ -61,7 +61,7 @@ static void shutdown_oaks32r_irq(unsigned int irq) ...@@ -61,7 +61,7 @@ static void shutdown_oaks32r_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type oaks32r_irq_type = static struct irq_chip oaks32r_irq_type =
{ {
.typename = "OAKS32R-IRQ", .typename = "OAKS32R-IRQ",
.startup = startup_oaks32r_irq, .startup = startup_oaks32r_irq,
......
...@@ -70,7 +70,7 @@ static void shutdown_opsput_irq(unsigned int irq) ...@@ -70,7 +70,7 @@ static void shutdown_opsput_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type opsput_irq_type = static struct irq_chip opsput_irq_type =
{ {
.typename = "OPSPUT-IRQ", .typename = "OPSPUT-IRQ",
.startup = startup_opsput_irq, .startup = startup_opsput_irq,
...@@ -147,7 +147,7 @@ static void shutdown_opsput_pld_irq(unsigned int irq) ...@@ -147,7 +147,7 @@ static void shutdown_opsput_pld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); outw(PLD_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type opsput_pld_irq_type = static struct irq_chip opsput_pld_irq_type =
{ {
.typename = "OPSPUT-PLD-IRQ", .typename = "OPSPUT-PLD-IRQ",
.startup = startup_opsput_pld_irq, .startup = startup_opsput_pld_irq,
...@@ -216,7 +216,7 @@ static void shutdown_opsput_lanpld_irq(unsigned int irq) ...@@ -216,7 +216,7 @@ static void shutdown_opsput_lanpld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); outw(PLD_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type opsput_lanpld_irq_type = static struct irq_chip opsput_lanpld_irq_type =
{ {
.typename = "OPSPUT-PLD-LAN-IRQ", .typename = "OPSPUT-PLD-LAN-IRQ",
.startup = startup_opsput_lanpld_irq, .startup = startup_opsput_lanpld_irq,
...@@ -285,7 +285,7 @@ static void shutdown_opsput_lcdpld_irq(unsigned int irq) ...@@ -285,7 +285,7 @@ static void shutdown_opsput_lcdpld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); outw(PLD_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type opsput_lcdpld_irq_type = static struct irq_chip opsput_lcdpld_irq_type =
{ {
"OPSPUT-PLD-LCD-IRQ", "OPSPUT-PLD-LCD-IRQ",
startup_opsput_lcdpld_irq, startup_opsput_lcdpld_irq,
......
...@@ -61,7 +61,7 @@ static void shutdown_mappi_irq(unsigned int irq) ...@@ -61,7 +61,7 @@ static void shutdown_mappi_irq(unsigned int irq)
outl(M32R_ICUCR_ILEVEL7, port); outl(M32R_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type mappi_irq_type = static struct irq_chip mappi_irq_type =
{ {
.typename = "M32700-IRQ", .typename = "M32700-IRQ",
.startup = startup_mappi_irq, .startup = startup_mappi_irq,
...@@ -134,7 +134,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq) ...@@ -134,7 +134,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)
outw(PLD_ICUCR_ILEVEL7, port); outw(PLD_ICUCR_ILEVEL7, port);
} }
static struct hw_interrupt_type m32700ut_pld_irq_type = static struct irq_chip m32700ut_pld_irq_type =
{ {
.typename = "USRV-PLD-IRQ", .typename = "USRV-PLD-IRQ",
.startup = startup_m32700ut_pld_irq, .startup = startup_m32700ut_pld_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