Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87511d09 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 80dbb01a

arch/m68k/atari/atakeyb.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

arch/m68k/atari/stdma.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

}

arch/m68k/atari/time.c

+1 −2
Original line number Diff line number Diff line
@@ -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");

}

arch/m68k/include/asm/atariints.h

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ 
/* convert irq_handler index to vector number */

#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 */

#define IRQ_MFP_BUSY      (8)

#define IRQ_MFP_DCD       (9)