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, 22 deletions

diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index 9e493958895d..956ea0ed1694 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -69,29 +69,11 @@ i8259a_mask_and_ack_irq(unsigned int irq)
         spin_unlock(&i8259_irq_lock);
 }
 
-unsigned int
-i8259a_startup_irq(unsigned int irq)
-{
-        i8259a_enable_irq(irq);
-        return 0; /* never anything pending */
-}
-
-void
-i8259a_end_irq(unsigned int irq)
-{
-        struct irq_desc *desc = irq_to_desc(irq);
-        if (desc || !(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                i8259a_enable_irq(irq);
-}
-
 struct irq_chip i8259a_irq_type = {
         .name           = "XT-PIC",
-        .startup        = i8259a_startup_irq,
-        .shutdown       = i8259a_disable_irq,
-        .enable         = i8259a_enable_irq,
-        .disable        = i8259a_disable_irq,
-        .ack            = i8259a_mask_and_ack_irq,
-        .end            = i8259a_end_irq,
+        .unmask         = i8259a_enable_irq,
+        .mask           = i8259a_disable_irq,
+        .mask_ack       = i8259a_mask_and_ack_irq,
 };
 
 void __init
@@ -108,7 +90,7 @@ init_i8259a_irqs(void)
         outb(0xff, 0xA1);       /* mask all of 8259A-2 */
 
         for (i = 0; i < 16; i++) {
-                set_irq_chip_and_handler(i, &i8259a_irq_type, alpha_do_IRQ);
+                set_irq_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
         }
 
         setup_irq(2, &cascade);