Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k/atari: Remove obsolete IRQ_TYPE_*

IRQ_TYPE_SLOW, IRQ_TYPE_FAST, and IRQ_TYPE_PRIO are no longer used by
the Atari platform interrupt code since commit 734085651c9b80aa
("[PATCH] m68k: convert atari irq code") in v2.6.18-rc1, so drop them.

Note that their values have been reused for different purposes
(IRQ_TYPE_NONE, IRQ_TYPE_EDGE_RISING, and IRQ_TYPE_EDGE_FALLING) since
commit 6a6de9ef5850d063 ("[PATCH] genirq: core") in v2.6.18-rc1.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

+4 -11
+2 -3
arch/m68k/atari/atakeyb.c
··· 504 504 kb_state.state = KEYBOARD; 505 505 kb_state.len = 0; 506 506 507 - error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 508 - IRQ_TYPE_SLOW, "keyboard,mouse,MIDI", 509 - atari_keyboard_interrupt); 507 + error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 0, 508 + "keyboard,mouse,MIDI", atari_keyboard_interrupt); 510 509 if (error) 511 510 return error; 512 511
+1 -1
arch/m68k/atari/stdma.c
··· 198 198 void __init stdma_init(void) 199 199 { 200 200 stdma_isr = NULL; 201 - if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, 201 + if (request_irq(IRQ_MFP_FDC, stdma_int, IRQF_SHARED, 202 202 "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int)) 203 203 pr_err("Couldn't register ST-DMA interrupt\n"); 204 204 }
+1 -2
arch/m68k/atari/time.c
··· 32 32 /* start timer C, div = 1:100 */ 33 33 st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60; 34 34 /* install interrupt service routine for MFP Timer C */ 35 - if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW, 36 - "timer", timer_routine)) 35 + if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine)) 37 36 pr_err("Couldn't register timer interrupt\n"); 38 37 } 39 38
-5
arch/m68k/include/asm/atariints.h
··· 40 40 /* convert irq_handler index to vector number */ 41 41 #define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8))) 42 42 43 - /* interrupt service types */ 44 - #define IRQ_TYPE_SLOW 0 45 - #define IRQ_TYPE_FAST 1 46 - #define IRQ_TYPE_PRIO 2 47 - 48 43 /* ST-MFP interrupts */ 49 44 #define IRQ_MFP_BUSY (8) 50 45 #define IRQ_MFP_DCD (9)