1 files changed, 4 insertions, 21 deletions

diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index dc3c23265ef..f8a1e8a862f 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -60,28 +60,11 @@ takara_disable_irq(unsigned int irq)
         takara_update_irq_hw(irq, mask);
 }
 
-static unsigned int
-takara_startup_irq(unsigned int irq)
-{
-        takara_enable_irq(irq);
-        return 0; /* never anything pending */
-}
-
-static void
-takara_end_irq(unsigned int irq)
-{
-        if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                takara_enable_irq(irq);
-}
-
 static struct irq_chip takara_irq_type = {
         .name           = "TAKARA",
-        .startup        = takara_startup_irq,
-        .shutdown       = takara_disable_irq,
-        .enable         = takara_enable_irq,
-        .disable        = takara_disable_irq,
-        .ack            = takara_disable_irq,
-        .end            = takara_end_irq,
+        .unmask         = takara_enable_irq,
+        .mask           = takara_disable_irq,
+        .mask_ack       = takara_disable_irq,
 };
 
 static void
@@ -154,7 +137,7 @@ takara_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_to_desc(i)->status |= IRQ_LEVEL;
-                set_irq_chip_and_handler(i, &takara_irq_type, alpha_do_IRQ);
+                set_irq_chip_and_handler(i, &takara_irq_type, handle_level_irq);
         }
 
         common_init_isa_dma();