aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 08:46:59 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:00:57 -0400
commit4facfde9f1d7b8a61fb0017460da45e23e60115c (patch)
tree00da6c7110b4d19869f65ce0e2da085788112060
parent92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 (diff)
[PATCH] m68k: cleanup generic irq names
Rename IRQ1..IRQ7 to IRQ_AUTO_1..IRQ_AUTO_7 and remove the duplicate defintions. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/m68k/kernel/ints.c4
-rw-r--r--arch/m68k/q40/q40ints.c4
-rw-r--r--drivers/net/sun3lance.c2
-rw-r--r--include/asm-m68k/atariints.h11
-rw-r--r--include/asm-m68k/irq.h22
-rw-r--r--include/asm-m68k/macints.h11
6 files changed, 15 insertions, 39 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 895a56d69eba..3ce7c6166bb9 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -153,7 +153,7 @@ int cpu_request_irq(unsigned int irq,
153 irqreturn_t (*handler)(int, void *, struct pt_regs *), 153 irqreturn_t (*handler)(int, void *, struct pt_regs *),
154 unsigned long flags, const char *devname, void *dev_id) 154 unsigned long flags, const char *devname, void *dev_id)
155{ 155{
156 if (irq < IRQ1 || irq > IRQ7) { 156 if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) {
157 printk("%s: Incorrect IRQ %d from %s\n", 157 printk("%s: Incorrect IRQ %d from %s\n",
158 __FUNCTION__, irq, devname); 158 __FUNCTION__, irq, devname);
159 return -ENXIO; 159 return -ENXIO;
@@ -183,7 +183,7 @@ int cpu_request_irq(unsigned int irq,
183 183
184void cpu_free_irq(unsigned int irq, void *dev_id) 184void cpu_free_irq(unsigned int irq, void *dev_id)
185{ 185{
186 if (irq < IRQ1 || irq > IRQ7) { 186 if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) {
187 printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq); 187 printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
188 return; 188 return;
189 } 189 }
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index f8ecc2664fe6..b106839ad813 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -93,8 +93,8 @@ void q40_init_IRQ (void)
93 } 93 }
94 94
95 /* setup handler for ISA ints */ 95 /* setup handler for ISA ints */
96 cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip", 96 cpu_request_irq(IRQ_AUTO_2, q40_irq2_handler, 0,
97 NULL); 97 "q40 ISA and master chip", NULL);
98 98
99 /* now enable some ints.. */ 99 /* now enable some ints.. */
100 master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */ 100 master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index d4c0002b43db..a2fad50437e6 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -55,7 +55,7 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne
55/* sun3/60 addr/irq for the lance chip. If your sun is different, 55/* sun3/60 addr/irq for the lance chip. If your sun is different,
56 change this. */ 56 change this. */
57#define LANCE_OBIO 0x120000 57#define LANCE_OBIO 0x120000
58#define LANCE_IRQ IRQ3 58#define LANCE_IRQ IRQ_AUTO_3
59 59
60/* Debug level: 60/* Debug level:
61 * 0 = silent, print only serious errors 61 * 0 = silent, print only serious errors
diff --git a/include/asm-m68k/atariints.h b/include/asm-m68k/atariints.h
index 42952c890593..0ed454fc24bb 100644
--- a/include/asm-m68k/atariints.h
+++ b/include/asm-m68k/atariints.h
@@ -45,17 +45,6 @@
45#define IRQ_TYPE_FAST 1 45#define IRQ_TYPE_FAST 1
46#define IRQ_TYPE_PRIO 2 46#define IRQ_TYPE_PRIO 2
47 47
48#define IRQ_SPURIOUS (0)
49
50/* auto-vector interrupts */
51#define IRQ_AUTO_1 (1)
52#define IRQ_AUTO_2 (2)
53#define IRQ_AUTO_3 (3)
54#define IRQ_AUTO_4 (4)
55#define IRQ_AUTO_5 (5)
56#define IRQ_AUTO_6 (6)
57#define IRQ_AUTO_7 (7)
58
59/* ST-MFP interrupts */ 48/* ST-MFP interrupts */
60#define IRQ_MFP_BUSY (8) 49#define IRQ_MFP_BUSY (8)
61#define IRQ_MFP_DCD (9) 50#define IRQ_MFP_DCD (9)
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 9727ca9d9f26..320a084bbd11 100644
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -4,7 +4,7 @@
4#include <linux/interrupt.h> 4#include <linux/interrupt.h>
5 5
6/* 6/*
7 * # of m68k interrupts 7 * # of m68k auto vector interrupts
8 */ 8 */
9 9
10#define SYS_IRQS 8 10#define SYS_IRQS 8
@@ -40,19 +40,17 @@
40 * that routine requires service. 40 * that routine requires service.
41 */ 41 */
42 42
43#define IRQ1 (1) /* level 1 interrupt */ 43#define IRQ_SPURIOUS 0
44#define IRQ2 (2) /* level 2 interrupt */
45#define IRQ3 (3) /* level 3 interrupt */
46#define IRQ4 (4) /* level 4 interrupt */
47#define IRQ5 (5) /* level 5 interrupt */
48#define IRQ6 (6) /* level 6 interrupt */
49#define IRQ7 (7) /* level 7 interrupt (non-maskable) */
50 44
51/* 45#define IRQ_AUTO_1 1 /* level 1 interrupt */
52 * "Generic" interrupt sources 46#define IRQ_AUTO_2 2 /* level 2 interrupt */
53 */ 47#define IRQ_AUTO_3 3 /* level 3 interrupt */
48#define IRQ_AUTO_4 4 /* level 4 interrupt */
49#define IRQ_AUTO_5 5 /* level 5 interrupt */
50#define IRQ_AUTO_6 6 /* level 6 interrupt */
51#define IRQ_AUTO_7 7 /* level 7 interrupt (non-maskable) */
54 52
55#define IRQ_SCHED_TIMER (8) /* interrupt source for scheduling timer */ 53#define IRQ_USER 8
56 54
57static __inline__ int irq_canonicalize(int irq) 55static __inline__ int irq_canonicalize(int irq)
58{ 56{
diff --git a/include/asm-m68k/macints.h b/include/asm-m68k/macints.h
index fd8c3a9fea4d..c9604f821bd4 100644
--- a/include/asm-m68k/macints.h
+++ b/include/asm-m68k/macints.h
@@ -59,17 +59,6 @@
59#define IRQ_SRC(irq) (irq >> 3) 59#define IRQ_SRC(irq) (irq >> 3)
60#define IRQ_IDX(irq) (irq & 7) 60#define IRQ_IDX(irq) (irq & 7)
61 61
62#define IRQ_SPURIOUS (0)
63
64/* auto-vector interrupts */
65#define IRQ_AUTO_1 (1)
66#define IRQ_AUTO_2 (2)
67#define IRQ_AUTO_3 (3)
68#define IRQ_AUTO_4 (4)
69#define IRQ_AUTO_5 (5)
70#define IRQ_AUTO_6 (6)
71#define IRQ_AUTO_7 (7)
72
73/* VIA1 interrupts */ 62/* VIA1 interrupts */
74#define IRQ_VIA1_0 (8) /* one second int. */ 63#define IRQ_VIA1_0 (8) /* one second int. */
75#define IRQ_VIA1_1 (9) /* VBlank int. */ 64#define IRQ_VIA1_1 (9) /* VBlank int. */