hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 734085651c
("[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 6a6de9ef58 ("[PATCH] genirq: core") in v2.6.18-rc1.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2014-10-05 22:34:40 +02:00
parent 80dbb01ad7
commit 87511d0920
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/m68k/atari/atakeyb.c
View File

@ -504,9 +504,8 @@ int atari_keyb_init(void)
kb_state.state = KEYBOARD; kb_state.state = KEYBOARD;
kb_state.len = 0; kb_state.len = 0;
error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 0,
IRQ_TYPE_SLOW, "keyboard,mouse,MIDI", "keyboard,mouse,MIDI", atari_keyboard_interrupt);
atari_keyboard_interrupt);
if (error) if (error)
return error; return error;

2
arch/m68k/atari/stdma.c
View File

@ -198,7 +198,7 @@ EXPORT_SYMBOL(stdma_islocked);
void __init stdma_init(void) void __init stdma_init(void)
{ {
stdma_isr = NULL; stdma_isr = NULL;
if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, if (request_irq(IRQ_MFP_FDC, stdma_int, IRQF_SHARED,
"ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int)) "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int))
pr_err("Couldn't register ST-DMA interrupt\n"); pr_err("Couldn't register ST-DMA interrupt\n");
} }

3
arch/m68k/atari/time.c
View File

@ -32,8 +32,7 @@ atari_sched_init(irq_handler_t timer_routine)
/* start timer C, div = 1:100 */ /* start timer C, div = 1:100 */
st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60; st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60;
/* install interrupt service routine for MFP Timer C */ /* install interrupt service routine for MFP Timer C */
if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW, if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine))
"timer", timer_routine))
pr_err("Couldn't register timer interrupt\n"); pr_err("Couldn't register timer interrupt\n");
} }

5
arch/m68k/include/asm/atariints.h
View File

@ -40,11 +40,6 @@
/* convert irq_handler index to vector number */ /* convert irq_handler index to vector number */
#define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8))) #define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8)))
/* interrupt service types */
#define IRQ_TYPE_SLOW 0
#define IRQ_TYPE_FAST 1
#define IRQ_TYPE_PRIO 2
/* ST-MFP interrupts */ /* ST-MFP interrupts */
#define IRQ_MFP_BUSY (8) #define IRQ_MFP_BUSY (8)
#define IRQ_MFP_DCD (9) #define IRQ_MFP_DCD (9)