aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac/via.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-07-13 16:33:13 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:48 -0500
commit5a2394534b160ce18f9a705cf9de40e77648f8a2 (patch)
tree38d679c3633b4d2154ec68dbcc17ba2c207afb83 /arch/m68k/mac/via.c
parent1425df87c25b15400c9f26d57821bcfe01286b2a (diff)
m68k/irq: Remove obsolete IRQ_FLG_* users
The m68k core irq code stopped honoring these flags during the irq restructuring in 2006. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/via.c')
-rw-r--r--arch/m68k/mac/via.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 067857046137..af9ed33bec14 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -281,7 +281,7 @@ void __init via_init_clock(irq_handler_t func)
281 via1[vT1CL] = MAC_CLOCK_LOW; 281 via1[vT1CL] = MAC_CLOCK_LOW;
282 via1[vT1CH] = MAC_CLOCK_HIGH; 282 via1[vT1CH] = MAC_CLOCK_HIGH;
283 283
284 if (request_irq(IRQ_MAC_TIMER_1, func, IRQ_FLG_LOCK, "timer", func)) 284 if (request_irq(IRQ_MAC_TIMER_1, func, 0, "timer", func))
285 pr_err("Couldn't register %s interrupt\n", "timer"); 285 pr_err("Couldn't register %s interrupt\n", "timer");
286} 286}
287 287
@@ -292,25 +292,19 @@ void __init via_init_clock(irq_handler_t func)
292void __init via_register_interrupts(void) 292void __init via_register_interrupts(void)
293{ 293{
294 if (via_alt_mapping) { 294 if (via_alt_mapping) {
295 if (request_irq(IRQ_AUTO_1, via1_irq, 295 if (request_irq(IRQ_AUTO_1, via1_irq, 0, "software",
296 IRQ_FLG_LOCK|IRQ_FLG_FAST, "software", 296 (void *)via1))
297 (void *) via1))
298 pr_err("Couldn't register %s interrupt\n", "software"); 297 pr_err("Couldn't register %s interrupt\n", "software");
299 if (request_irq(IRQ_AUTO_6, via1_irq, 298 if (request_irq(IRQ_AUTO_6, via1_irq, 0, "via1", (void *)via1))
300 IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
301 (void *) via1))
302 pr_err("Couldn't register %s interrupt\n", "via1"); 299 pr_err("Couldn't register %s interrupt\n", "via1");
303 } else { 300 } else {
304 if (request_irq(IRQ_AUTO_1, via1_irq, 301 if (request_irq(IRQ_AUTO_1, via1_irq, 0, "via1", (void *)via1))
305 IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
306 (void *) via1))
307 pr_err("Couldn't register %s interrupt\n", "via1"); 302 pr_err("Couldn't register %s interrupt\n", "via1");
308 } 303 }
309 if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, 304 if (request_irq(IRQ_AUTO_2, via2_irq, 0, "via2", (void *)via2))
310 "via2", (void *) via2))
311 pr_err("Couldn't register %s interrupt\n", "via2"); 305 pr_err("Couldn't register %s interrupt\n", "via2");
312 if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, 306 if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, 0, "nubus",
313 IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2)) 307 (void *)via2))
314 pr_err("Couldn't register %s interrupt\n", "nubus"); 308 pr_err("Couldn't register %s interrupt\n", "nubus");
315} 309}
316 310