diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-10-15 02:31:34 (GMT) |
|---|---|---|
| committer | Matt Turner <mattst88@monolith.freenet-rz.de> | 2011-01-17 04:42:13 (GMT) |
| commit | 7d209c8110ecd49db46da786437485e8ef67f414 (patch) | |
| tree | bc550d6f1a7933a56194390255c5b836e41817a7 /arch/alpha/kernel/sys_sable.c | |
| parent | a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc (diff) | |
| download | linux-7d209c8110ecd49db46da786437485e8ef67f414.tar.xz | |
alpha: kill off alpha_do_IRQ
Good riddance... Nuke a pile of redundant handlers that the
generic code takes care of as well.
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/sys_sable.c')
| -rw-r--r-- | arch/alpha/kernel/sys_sable.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c index ed88315..5c4423d 100644 --- a/arch/alpha/kernel/sys_sable.c +++ b/arch/alpha/kernel/sys_sable.c @@ -474,20 +474,6 @@ sable_lynx_disable_irq(unsigned int irq) #endif } -static unsigned int -sable_lynx_startup_irq(unsigned int irq) -{ - sable_lynx_enable_irq(irq); - return 0; -} - -static void -sable_lynx_end_irq(unsigned int irq) -{ - if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS))) - sable_lynx_enable_irq(irq); -} - static void sable_lynx_mask_and_ack_irq(unsigned int irq) { @@ -503,12 +489,9 @@ sable_lynx_mask_and_ack_irq(unsigned int irq) static struct irq_chip sable_lynx_irq_type = { .name = "SABLE/LYNX", - .startup = sable_lynx_startup_irq, - .shutdown = sable_lynx_disable_irq, - .enable = sable_lynx_enable_irq, - .disable = sable_lynx_disable_irq, - .ack = sable_lynx_mask_and_ack_irq, - .end = sable_lynx_end_irq, + .unmask = sable_lynx_enable_irq, + .mask = sable_lynx_disable_irq, + .mask_ack = sable_lynx_mask_and_ack_irq, }; static void @@ -537,7 +520,7 @@ sable_lynx_init_irq(int nr_of_irqs) for (i = 0; i < nr_of_irqs; ++i) { irq_to_desc(i)->status |= IRQ_LEVEL; set_irq_chip_and_handler(i, &sable_lynx_irq_type, - alpha_do_IRQ); + handle_level_irq); } common_init_isa_dma(); |