Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / alpha / kernel / sys_mikasa.c

diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index ee88651..bcc1639 100644 (file)
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -54,28 +54,11 @@ mikasa_disable_irq(unsigned int irq)
        mikasa_update_irq_hw(cached_irq_mask &= ~(1 << (irq - 16)));
 }
 
-static unsigned int
-mikasa_startup_irq(unsigned int irq)
-{
-       mikasa_enable_irq(irq);
-       return 0;
-}
-
-static void
-mikasa_end_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               mikasa_enable_irq(irq);
-}
-
 static struct irq_chip mikasa_irq_type = {
        .name           = "MIKASA",
-       .startup        = mikasa_startup_irq,
-       .shutdown       = mikasa_disable_irq,
-       .enable         = mikasa_enable_irq,
-       .disable        = mikasa_disable_irq,
-       .ack            = mikasa_disable_irq,
-       .end            = mikasa_end_irq,
+       .unmask         = mikasa_enable_irq,
+       .mask           = mikasa_disable_irq,
+       .mask_ack       = mikasa_disable_irq,
 };
 
 static void 
@@ -115,8 +98,8 @@ mikasa_init_irq(void)
        mikasa_update_irq_hw(0);
 
        for (i = 16; i < 32; ++i) {
-               irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-               irq_desc[i].chip = &mikasa_irq_type;
+               irq_to_desc(i)->status |= IRQ_LEVEL;
+               set_irq_chip_and_handler(i, &mikasa_irq_type, handle_level_irq);
        }
 
        init_i8259a_irqs();