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

Commit b0b9fdc1 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: M68K: Use the new IRQF_ constants 



Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f6f23887

arch/m68k/amiga/amiints.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 *

 * 07/08/99: rewamp of the interrupt handling - we now have two types of

 *           interrupts, normal and fast handlers, fast handlers being

 *           marked with SA_INTERRUPT and runs with all other interrupts

 *           marked with IRQF_DISABLED and runs with all other interrupts

 *           disabled. Normal interrupts disable their own source but

 *           run with all other interrupt sources enabled.

 *           PORTS and EXTER interrupts are always shared even if the

arch/m68k/amiga/cia.c

+1 −1
Original line number Diff line number Diff line
@@ -176,5 +176,5 @@ void __init cia_init_IRQ(struct ciabase *base) 
	/* override auto int and install CIA handler */

	m68k_setup_irq_controller(&auto_irq_controller, base->handler_irq, 1);

	m68k_irq_startup(base->handler_irq);

	request_irq(base->handler_irq, cia_handler, SA_SHIRQ, base->name, base);

	request_irq(base->handler_irq, cia_handler, IRQF_SHARED, base->name, base);

}

arch/m68k/kernel/ints.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int setup_irq(unsigned int irq, struct irq_node *node) 
	prev = irq_list + irq;

	if (*prev) {

		/* Can't share interrupts unless both agree to */

		if (!((*prev)->flags & node->flags & SA_SHIRQ)) {

		if (!((*prev)->flags & node->flags & IRQF_SHARED)) {

			spin_unlock_irqrestore(&contr->lock, flags);

			return -EBUSY;

		}

include/asm-m68k/floppy.h

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static __inline__ void fd_outb(unsigned char value, int port) 
static int fd_request_irq(void)

{

	if(MACH_IS_Q40)

		return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,

						   "floppy", floppy_hardint);

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", floppy_hardint);

	else if(MACH_IS_SUN3X)

		return sun3xflop_request_irq();

	return -ENXIO;

include/asm-m68k/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ struct pt_regs; 


/*

 * various flags for request_irq() - the Amiga now uses the standard

 * mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ

 * are your friends.

 * mechanism like all other architectures - IRQF_DISABLED and

 * IRQF_SHARED are your friends.

 */

#ifndef MACH_AMIGA_ONLY

#define IRQ_FLG_LOCK	(0x0001)	/* handler is not replaceable	*/