m68k/irq: Remove obsolete IRQ_FLG_* users

-29

arch/m68k/amiga/amiints.c

··· 4 4 * This file is subject to the terms and conditions of the GNU General Public 5 5 * License. See the file COPYING in the main directory of this archive 6 6 * for more details. 7 - * 8 - * 11/07/96: rewritten interrupt handling, irq lists are exists now only for 9 - * this sources where it makes sense (VERTB/PORTS/EXTER) and you must 10 - * be careful that dev_id for this sources is unique since this the 11 - * only possibility to distinguish between different handlers for 12 - * free_irq. irq lists also have different irq flags: 13 - * - IRQ_FLG_FAST: handler is inserted at top of list (after other 14 - * fast handlers) 15 - * - IRQ_FLG_SLOW: handler is inserted at bottom of list and before 16 - * they're executed irq level is set to the previous 17 - * one, but handlers don't need to be reentrant, if 18 - * reentrance occurred, slow handlers will be just 19 - * called again. 20 - * The whole interrupt handling for CIAs is moved to cia.c 21 - * /Roman Zippel 22 - * 23 - * 07/08/99: rewamp of the interrupt handling - we now have two types of 24 - * interrupts, normal and fast handlers, fast handlers being 25 - * marked with IRQF_DISABLED and runs with all other interrupts 26 - * disabled. Normal interrupts disable their own source but 27 - * run with all other interrupt sources enabled. 28 - * PORTS and EXTER interrupts are always shared even if the 29 - * drivers do not explicitly mark this when calling 30 - * request_irq which they really should do. 31 - * This is similar to the way interrupts are handled on all 32 - * other architectures and makes a ton of sense besides 33 - * having the advantage of making it easier to share 34 - * drivers. 35 - * /Jes 36 7 */ 37 8 38 9 #include <linux/init.h>

+1 -1

arch/m68k/hp300/time.c

··· 70 70 71 71 asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE)); 72 72 73 - if (request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector)) 73 + if (request_irq(IRQ_AUTO_6, hp300_tick, 0, "timer tick", vector)) 74 74 pr_err("Couldn't register timer interrupt\n"); 75 75 76 76 out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */

-19

arch/m68k/kernel/ints.c

··· 4 4 * This file is subject to the terms and conditions of the GNU General Public 5 5 * License. See the file COPYING in the main directory of this archive 6 6 * for more details. 7 - * 8 - * 07/03/96: Timer initialization, and thus mach_sched_init(), 9 - * removed from request_irq() and moved to init_time(). 10 - * We should therefore consider renaming our add_isr() and 11 - * remove_isr() to request_irq() and free_irq() 12 - * respectively, so they are compliant with the other 13 - * architectures. /Jes 14 - * 11/07/96: Changed all add_/remove_isr() to request_/free_irq() calls. 15 - * Removed irq list support, if any machine needs an irq server 16 - * it must implement this itself (as it's already done), instead 17 - * only default handler are used with mach_default_handler. 18 - * request_irq got some flags different from other architectures: 19 - * - IRQ_FLG_REPLACE : Replace an existing handler (the default one 20 - * can be replaced without this flag) 21 - * - IRQ_FLG_LOCK : handler can't be replaced 22 - * There are other machine depending flags, see there 23 - * If you want to replace a default handler you should know what 24 - * you're doing, since it might handle different other irq sources 25 - * which must be served /Roman Zippel 26 7 */ 27 8 28 9 #include <linux/module.h>

+4 -6

arch/m68k/mac/iop.c

··· 305 305 { 306 306 if (iop_ism_present) { 307 307 if (oss_present) { 308 - if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 309 - IRQ_FLG_LOCK, "ISM IOP", 310 - (void *) IOP_NUM_ISM)) 308 + if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 0, 309 + "ISM IOP", (void *)IOP_NUM_ISM)) 311 310 pr_err("Couldn't register ISM IOP interrupt\n"); 312 311 oss_irq_enable(IRQ_MAC_ADB); 313 312 } else { 314 - if (request_irq(IRQ_VIA2_0, iop_ism_irq, 315 - IRQ_FLG_LOCK|IRQ_FLG_FAST, "ISM IOP", 316 - (void *) IOP_NUM_ISM)) 313 + if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP", 314 + (void *)IOP_NUM_ISM)) 317 315 pr_err("Couldn't register ISM IOP interrupt\n"); 318 316 } 319 317 if (!iop_alive(iop_base[IOP_NUM_ISM])) {

+5 -8

arch/m68k/mac/oss.c

··· 65 65 66 66 void __init oss_register_interrupts(void) 67 67 { 68 - if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK, 69 - "scsi", (void *) oss)) 68 + if (request_irq(OSS_IRQLEV_SCSI, oss_irq, 0, "scsi", (void *)oss)) 70 69 pr_err("Couldn't register %s interrupt\n", "scsi"); 71 - if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK, 72 - "nubus", (void *) oss)) 70 + if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, 0, "nubus", 71 + (void *)oss)) 73 72 pr_err("Couldn't register %s interrupt\n", "nubus"); 74 - if (request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK, 75 - "sound", (void *) oss)) 73 + if (request_irq(OSS_IRQLEV_SOUND, oss_irq, 0, "sound", (void *)oss)) 76 74 pr_err("Couldn't register %s interrupt\n", "sound"); 77 - if (request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK, 78 - "via1", (void *) via1)) 75 + if (request_irq(OSS_IRQLEV_VIA1, via1_irq, 0, "via1", (void *)via1)) 79 76 pr_err("Couldn't register %s interrupt\n", "via1"); 80 77 } 81 78

+8 -14

arch/m68k/mac/via.c

··· 281 281 via1[vT1CL] = MAC_CLOCK_LOW; 282 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 285 pr_err("Couldn't register %s interrupt\n", "timer"); 286 286 } 287 287 ··· 292 292 void __init via_register_interrupts(void) 293 293 { 294 294 if (via_alt_mapping) { 295 - if (request_irq(IRQ_AUTO_1, via1_irq, 296 - IRQ_FLG_LOCK|IRQ_FLG_FAST, "software", 297 - (void *) via1)) 295 + if (request_irq(IRQ_AUTO_1, via1_irq, 0, "software", 296 + (void *)via1)) 298 297 pr_err("Couldn't register %s interrupt\n", "software"); 299 - if (request_irq(IRQ_AUTO_6, via1_irq, 300 - IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1", 301 - (void *) via1)) 298 + if (request_irq(IRQ_AUTO_6, via1_irq, 0, "via1", (void *)via1)) 302 299 pr_err("Couldn't register %s interrupt\n", "via1"); 303 300 } else { 304 - if (request_irq(IRQ_AUTO_1, via1_irq, 305 - IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1", 306 - (void *) via1)) 301 + if (request_irq(IRQ_AUTO_1, via1_irq, 0, "via1", (void *)via1)) 307 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, 310 - "via2", (void *) via2)) 304 + if (request_irq(IRQ_AUTO_2, via2_irq, 0, "via2", (void *)via2)) 311 305 pr_err("Couldn't register %s interrupt\n", "via2"); 312 - if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, 313 - IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2)) 306 + if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, 0, "nubus", 307 + (void *)via2)) 314 308 pr_err("Couldn't register %s interrupt\n", "nubus"); 315 309 } 316 310

+1 -2

arch/m68k/mvme147/config.c

··· 114 114 void mvme147_sched_init (irq_handler_t timer_routine) 115 115 { 116 116 tick_handler = timer_routine; 117 - if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQ_FLG_REPLACE, 118 - "timer 1", NULL)) 117 + if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, 0, "timer 1", NULL)) 119 118 pr_err("Couldn't register timer interrupt\n"); 120 119 121 120 /* Init the clock with a value */

+1 -1

drivers/macintosh/via-macii.c

··· 159 159 err = macii_init_via(); 160 160 if (err) goto out; 161 161 162 - err = request_irq(IRQ_MAC_ADB, macii_interrupt, IRQ_FLG_LOCK, "ADB", 162 + err = request_irq(IRQ_MAC_ADB, macii_interrupt, 0, "ADB", 163 163 macii_interrupt); 164 164 if (err) goto out; 165 165

+2 -2

drivers/macintosh/via-maciisi.c

··· 122 122 return err; 123 123 } 124 124 125 - if (request_irq(IRQ_MAC_ADB, maciisi_interrupt, IRQ_FLG_LOCK | IRQ_FLG_FAST, 126 - "ADB", maciisi_interrupt)) { 125 + if (request_irq(IRQ_MAC_ADB, maciisi_interrupt, 0, "ADB", 126 + maciisi_interrupt)) { 127 127 printk(KERN_ERR "maciisi_init: can't get irq %d\n", IRQ_MAC_ADB); 128 128 return -EAGAIN; 129 129 }