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>

1 files changed, 4 insertions, 21 deletions

diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index 8a029a913014..89e7e37ec84c 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -58,28 +58,11 @@ rx164_disable_irq(unsigned int irq)
         rx164_update_irq_hw(cached_irq_mask &= ~(1UL << (irq - 16)));
 }
 
-static unsigned int
-rx164_startup_irq(unsigned int irq)
-{
-        rx164_enable_irq(irq);
-        return 0;
-}
-
-static void
-rx164_end_irq(unsigned int irq)
-{
-        if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                rx164_enable_irq(irq);
-}
-
 static struct irq_chip rx164_irq_type = {
         .name           = "RX164",
-        .startup        = rx164_startup_irq,
-        .shutdown       = rx164_disable_irq,
-        .enable         = rx164_enable_irq,
-        .disable        = rx164_disable_irq,
-        .ack            = rx164_disable_irq,
-        .end            = rx164_end_irq,
+        .unmask         = rx164_enable_irq,
+        .mask           = rx164_disable_irq,
+        .mask_ack       = rx164_disable_irq,
 };
 
 static void 
@@ -117,7 +100,7 @@ rx164_init_irq(void)
         rx164_update_irq_hw(0);
         for (i = 16; i < 40; ++i) {
                 irq_to_desc(i)->status |= IRQ_LEVEL;
-                set_irq_chip_and_handler(i, &rx164_irq_type, alpha_do_IRQ);
+                set_irq_chip_and_handler(i, &rx164_irq_type, handle_level_irq);
         }
 
         init_i8259a_irqs();