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_eiger.c b/arch/alpha/kernel/sys_eiger.c
index 4f3596e248c6..1121bc5c6c6c 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -66,28 +66,11 @@ eiger_disable_irq(unsigned int irq)
         eiger_update_irq_hw(irq, mask);
 }
 
-static unsigned int
-eiger_startup_irq(unsigned int irq)
-{
-        eiger_enable_irq(irq);
-        return 0; /* never anything pending */
-}
-
-static void
-eiger_end_irq(unsigned int irq)
-{
-        if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                eiger_enable_irq(irq);
-}
-
 static struct irq_chip eiger_irq_type = {
         .name           = "EIGER",
-        .startup        = eiger_startup_irq,
-        .shutdown       = eiger_disable_irq,
-        .enable         = eiger_enable_irq,
-        .disable        = eiger_disable_irq,
-        .ack            = eiger_disable_irq,
-        .end            = eiger_end_irq,
+        .unmask         = eiger_enable_irq,
+        .mask           = eiger_disable_irq,
+        .mask_ack       = eiger_disable_irq,
 };
 
 static void
@@ -154,7 +137,7 @@ eiger_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_to_desc(i)->status |= IRQ_LEVEL;
-                set_irq_chip_and_handler(i, &eiger_irq_type, alpha_do_IRQ);
+                set_irq_chip_and_handler(i, &eiger_irq_type, handle_level_irq);
         }
 }