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 commit734085651c
("[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 commit6a6de9ef58
("[PATCH] genirq: core") in v2.6.18-rc1. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
@@ -504,9 +504,8 @@ int atari_keyb_init(void)
|
||||
kb_state.state = KEYBOARD;
|
||||
kb_state.len = 0;
|
||||
|
||||
error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt,
|
||||
IRQ_TYPE_SLOW, "keyboard,mouse,MIDI",
|
||||
atari_keyboard_interrupt);
|
||||
error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 0,
|
||||
"keyboard,mouse,MIDI", atari_keyboard_interrupt);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
|
@@ -198,7 +198,7 @@ EXPORT_SYMBOL(stdma_islocked);
|
||||
void __init stdma_init(void)
|
||||
{
|
||||
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))
|
||||
pr_err("Couldn't register ST-DMA interrupt\n");
|
||||
}
|
||||
|
@@ -32,8 +32,7 @@ atari_sched_init(irq_handler_t timer_routine)
|
||||
/* start timer C, div = 1:100 */
|
||||
st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60;
|
||||
/* install interrupt service routine for MFP Timer C */
|
||||
if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW,
|
||||
"timer", timer_routine))
|
||||
if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine))
|
||||
pr_err("Couldn't register timer interrupt\n");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user