tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Roman Zippel
and committed by
Linus Torvalds
4facfde9
92445eaa
+15
-39
+2
-2
arch/m68k/kernel/ints.c
+2
-2
arch/m68k/kernel/ints.c
···
153
153
irqreturn_t (*handler)(int, void *, struct pt_regs *),
154
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
157
printk("%s: Incorrect IRQ %d from %s\n",
158
158
__FUNCTION__, irq, devname);
159
159
return -ENXIO;
···
183
183
184
184
void 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
187
printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
188
188
return;
189
189
}
+2
-2
arch/m68k/q40/q40ints.c
+2
-2
arch/m68k/q40/q40ints.c
···
93
93
}
94
94
95
95
/* setup handler for ISA ints */
96
-
cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip",
97
-
NULL);
96
+
cpu_request_irq(IRQ_AUTO_2, q40_irq2_handler, 0,
97
+
"q40 ISA and master chip", NULL);
98
98
99
99
/* now enable some ints.. */
100
100
master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */
+1
-1
drivers/net/sun3lance.c
+1
-1
drivers/net/sun3lance.c
-11
include/asm-m68k/atariints.h
-11
include/asm-m68k/atariints.h
···
45
45
#define IRQ_TYPE_FAST 1
46
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
48
/* ST-MFP interrupts */
60
49
#define IRQ_MFP_BUSY (8)
61
50
#define IRQ_MFP_DCD (9)
+10
-12
include/asm-m68k/irq.h
+10
-12
include/asm-m68k/irq.h
···
4
4
#include <linux/interrupt.h>
5
5
6
6
/*
7
-
* # of m68k interrupts
7
+
* # of m68k auto vector interrupts
8
8
*/
9
9
10
10
#define SYS_IRQS 8
···
40
40
* that routine requires service.
41
41
*/
42
42
43
-
#define IRQ1 (1) /* level 1 interrupt */
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) */
43
+
#define IRQ_SPURIOUS 0
50
44
51
-
/*
52
-
* "Generic" interrupt sources
53
-
*/
45
+
#define IRQ_AUTO_1 1 /* level 1 interrupt */
46
+
#define IRQ_AUTO_2 2 /* level 2 interrupt */
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
57
55
static __inline__ int irq_canonicalize(int irq)
58
56
{
-11
include/asm-m68k/macints.h
-11
include/asm-m68k/macints.h
···
59
59
#define IRQ_SRC(irq) (irq >> 3)
60
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
62
/* VIA1 interrupts */
74
63
#define IRQ_VIA1_0 (8) /* one second int. */
75
64
#define IRQ_VIA1_1 (9) /* VBlank int. */