diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-25 08:47:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:00:57 -0400 |
commit | b5dc7840b3ebe9c7967dd8ba73db957767009ff9 (patch) | |
tree | 0c5d45c592f140937e4e3e49ac9bc4ea8fc2cef7 /arch/m68k/mac | |
parent | 1d174cfb0f2a8967433e157bae9c2d4dcdee5324 (diff) |
[PATCH] m68k: introduce irq controller
Introduce irq controller and use it to manage auto vector interrupts.
Introduce setup_irq() which can be used for irq setup.
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>
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r-- | arch/m68k/mac/config.c | 15 | ||||
-rw-r--r-- | arch/m68k/mac/macints.c | 7 |
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 19dce75711b1..7e04f2a695c0 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -94,20 +94,6 @@ static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *)) | |||
94 | via_init_clock(vector); | 94 | via_init_clock(vector); |
95 | } | 95 | } |
96 | 96 | ||
97 | extern irqreturn_t mac_default_handler(int, void *, struct pt_regs *); | ||
98 | |||
99 | irqreturn_t (*mac_handlers[8])(int, void *, struct pt_regs *)= | ||
100 | { | ||
101 | mac_default_handler, | ||
102 | mac_default_handler, | ||
103 | mac_default_handler, | ||
104 | mac_default_handler, | ||
105 | mac_default_handler, | ||
106 | mac_default_handler, | ||
107 | mac_default_handler, | ||
108 | mac_default_handler | ||
109 | }; | ||
110 | |||
111 | /* | 97 | /* |
112 | * Parse a Macintosh-specific record in the bootinfo | 98 | * Parse a Macintosh-specific record in the bootinfo |
113 | */ | 99 | */ |
@@ -188,7 +174,6 @@ void __init config_mac(void) | |||
188 | enable_irq = mac_enable_irq; | 174 | enable_irq = mac_enable_irq; |
189 | disable_irq = mac_disable_irq; | 175 | disable_irq = mac_disable_irq; |
190 | mach_get_model = mac_get_model; | 176 | mach_get_model = mac_get_model; |
191 | mach_default_handler = &mac_handlers; | ||
192 | mach_get_irq_list = show_mac_interrupts; | 177 | mach_get_irq_list = show_mac_interrupts; |
193 | mach_gettimeoffset = mac_gettimeoffset; | 178 | mach_gettimeoffset = mac_gettimeoffset; |
194 | #warning move to adb/via init | 179 | #warning move to adb/via init |
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c index 7a1600bd195d..73b39cd3f94c 100644 --- a/arch/m68k/mac/macints.c +++ b/arch/m68k/mac/macints.c | |||
@@ -637,13 +637,6 @@ int show_mac_interrupts(struct seq_file *p, void *v) | |||
637 | return 0; | 637 | return 0; |
638 | } | 638 | } |
639 | 639 | ||
640 | void mac_default_handler(int irq, void *dev_id, struct pt_regs *regs) | ||
641 | { | ||
642 | #ifdef DEBUG_SPURIOUS | ||
643 | printk("Unexpected IRQ %d on device %p\n", irq, dev_id); | ||
644 | #endif | ||
645 | } | ||
646 | |||
647 | static int num_debug[8]; | 640 | static int num_debug[8]; |
648 | 641 | ||
649 | irqreturn_t mac_debug_handler(int irq, void *dev_id, struct pt_regs *regs) | 642 | irqreturn_t mac_debug_handler(int irq, void *dev_id, struct pt_regs *regs) |