diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-02 09:41:42 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-07-13 16:25:58 -0400 |
commit | 94dee171df34b7955cd647da4c40ba67d55a7671 (patch) | |
tree | 4f4cb8c8d5e37a7bc33457ffff5caff85376037f /arch/mips/au1000 | |
parent | e1e80b4d24eddd1a76cd386e25164cf159661bd6 (diff) |
[MIPS] Eleminate interrupt migration helper use.
> #define hw_interrupt_type irq_chip
> typedef struct irq_chip hw_irq_controller;
> #define no_irq_type no_irq_chip
> typedef struct irq_desc irq_desc_t;
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r-- | arch/mips/au1000/common/irq.c | 8 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/irqmap.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index 29d6f8178bad..316722ee8cf5 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c | |||
@@ -251,7 +251,7 @@ void restore_local_and_enable(int controller, unsigned long mask) | |||
251 | } | 251 | } |
252 | 252 | ||
253 | 253 | ||
254 | static struct hw_interrupt_type rise_edge_irq_type = { | 254 | static struct irq_chip rise_edge_irq_type = { |
255 | .typename = "Au1000 Rise Edge", | 255 | .typename = "Au1000 Rise Edge", |
256 | .startup = startup_irq, | 256 | .startup = startup_irq, |
257 | .shutdown = shutdown_irq, | 257 | .shutdown = shutdown_irq, |
@@ -261,7 +261,7 @@ static struct hw_interrupt_type rise_edge_irq_type = { | |||
261 | .end = end_irq, | 261 | .end = end_irq, |
262 | }; | 262 | }; |
263 | 263 | ||
264 | static struct hw_interrupt_type fall_edge_irq_type = { | 264 | static struct irq_chip fall_edge_irq_type = { |
265 | .typename = "Au1000 Fall Edge", | 265 | .typename = "Au1000 Fall Edge", |
266 | .startup = startup_irq, | 266 | .startup = startup_irq, |
267 | .shutdown = shutdown_irq, | 267 | .shutdown = shutdown_irq, |
@@ -271,7 +271,7 @@ static struct hw_interrupt_type fall_edge_irq_type = { | |||
271 | .end = end_irq, | 271 | .end = end_irq, |
272 | }; | 272 | }; |
273 | 273 | ||
274 | static struct hw_interrupt_type either_edge_irq_type = { | 274 | static struct irq_chip either_edge_irq_type = { |
275 | .typename = "Au1000 Rise or Fall Edge", | 275 | .typename = "Au1000 Rise or Fall Edge", |
276 | .startup = startup_irq, | 276 | .startup = startup_irq, |
277 | .shutdown = shutdown_irq, | 277 | .shutdown = shutdown_irq, |
@@ -281,7 +281,7 @@ static struct hw_interrupt_type either_edge_irq_type = { | |||
281 | .end = end_irq, | 281 | .end = end_irq, |
282 | }; | 282 | }; |
283 | 283 | ||
284 | static struct hw_interrupt_type level_irq_type = { | 284 | static struct irq_chip level_irq_type = { |
285 | .typename = "Au1000 Level", | 285 | .typename = "Au1000 Level", |
286 | .startup = startup_irq, | 286 | .startup = startup_irq, |
287 | .shutdown = shutdown_irq, | 287 | .shutdown = shutdown_irq, |
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c index 2d49f32f4622..f66779f0d4cd 100644 --- a/arch/mips/au1000/pb1200/irqmap.c +++ b/arch/mips/au1000/pb1200/irqmap.c | |||
@@ -148,7 +148,7 @@ static void pb1200_end_irq(unsigned int irq_nr) | |||
148 | } | 148 | } |
149 | } | 149 | } |
150 | 150 | ||
151 | static struct hw_interrupt_type external_irq_type = | 151 | static struct irq_chip external_irq_type = |
152 | { | 152 | { |
153 | #ifdef CONFIG_MIPS_PB1200 | 153 | #ifdef CONFIG_MIPS_PB1200 |
154 | "Pb1200 Ext", | 154 | "Pb1200 Ext", |