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

Commit 4facfde9 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] m68k: cleanup generic irq names 



Rename IRQ1..IRQ7 to IRQ_AUTO_1..IRQ_AUTO_7 and remove the duplicate
defintions.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 92445eaa

arch/m68k/kernel/ints.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int cpu_request_irq(unsigned int irq, 
                    irqreturn_t (*handler)(int, void *, struct pt_regs *),

                    unsigned long flags, const char *devname, void *dev_id)

{

	if (irq < IRQ1 || irq > IRQ7) {

	if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) {

		printk("%s: Incorrect IRQ %d from %s\n",

		       __FUNCTION__, irq, devname);

		return -ENXIO;
@@ -183,7 +183,7 @@ int cpu_request_irq(unsigned int irq, 


void cpu_free_irq(unsigned int irq, void *dev_id)

{

	if (irq < IRQ1 || irq > IRQ7) {

	if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) {

		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);

		return;

	}

arch/m68k/q40/q40ints.c

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ void q40_init_IRQ (void) 
	}



	/* setup handler for ISA ints */

	cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip",

			NULL);

	cpu_request_irq(IRQ_AUTO_2, q40_irq2_handler, 0,

			"q40 ISA and master chip", NULL);



	/* now enable some ints.. */

	master_outb(1,EXT_ENABLE_REG);  /* ISA IRQ 5-15 */

drivers/net/sun3lance.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne 
/* sun3/60 addr/irq for the lance chip.  If your sun is different,

   change this. */

#define LANCE_OBIO 0x120000

#define LANCE_IRQ IRQ3

#define LANCE_IRQ IRQ_AUTO_3



/* Debug level:

 *  0 = silent, print only serious errors

include/asm-m68k/atariints.h

+0 −11
Original line number Diff line number Diff line
@@ -45,17 +45,6 @@ 
#define IRQ_TYPE_FAST     1

#define IRQ_TYPE_PRIO     2



#define	IRQ_SPURIOUS      (0)



/* auto-vector interrupts */

#define IRQ_AUTO_1        (1)

#define IRQ_AUTO_2        (2)

#define IRQ_AUTO_3        (3)

#define IRQ_AUTO_4        (4)

#define IRQ_AUTO_5        (5)

#define IRQ_AUTO_6        (6)

#define IRQ_AUTO_7        (7)



/* ST-MFP interrupts */

#define IRQ_MFP_BUSY      (8)

#define IRQ_MFP_DCD       (9)

include/asm-m68k/irq.h

+10 −12
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <linux/interrupt.h>



/*

 * # of m68k interrupts

 * # of m68k auto vector interrupts

 */



#define SYS_IRQS 8
@@ -40,19 +40,17 @@ 
 * that routine requires service.

 */



#define IRQ1		(1)	/* level 1 interrupt */

#define IRQ2		(2)	/* level 2 interrupt */

#define IRQ3		(3)	/* level 3 interrupt */

#define IRQ4		(4)	/* level 4 interrupt */

#define IRQ5		(5)	/* level 5 interrupt */

#define IRQ6		(6)	/* level 6 interrupt */

#define IRQ7		(7)	/* level 7 interrupt (non-maskable) */

#define IRQ_SPURIOUS	0



/*

 * "Generic" interrupt sources

 */

#define IRQ_AUTO_1	1	/* level 1 interrupt */

#define IRQ_AUTO_2	2	/* level 2 interrupt */

#define IRQ_AUTO_3	3	/* level 3 interrupt */

#define IRQ_AUTO_4	4	/* level 4 interrupt */

#define IRQ_AUTO_5	5	/* level 5 interrupt */

#define IRQ_AUTO_6	6	/* level 6 interrupt */

#define IRQ_AUTO_7	7	/* level 7 interrupt (non-maskable) */



#define IRQ_SCHED_TIMER	(8)    /* interrupt source for scheduling timer */

#define IRQ_USER	8



static __inline__ int irq_canonicalize(int irq)

{