Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-2.6.git] / arch / alpha / kernel / sys_rawhide.c
index 672cb2d..6a51364 100644 (file)
@@ -121,28 +121,11 @@ rawhide_mask_and_ack_irq(unsigned int irq)
        spin_unlock(&rawhide_irq_lock);
 }
 
-static unsigned int
-rawhide_startup_irq(unsigned int irq)
-{
-       rawhide_enable_irq(irq);
-       return 0;
-}
-
-static void
-rawhide_end_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               rawhide_enable_irq(irq);
-}
-
-static struct hw_interrupt_type rawhide_irq_type = {
-       .typename       = "RAWHIDE",
-       .startup        = rawhide_startup_irq,
-       .shutdown       = rawhide_disable_irq,
-       .enable         = rawhide_enable_irq,
-       .disable        = rawhide_disable_irq,
-       .ack            = rawhide_mask_and_ack_irq,
-       .end            = rawhide_end_irq,
+static struct irq_chip rawhide_irq_type = {
+       .name           = "RAWHIDE",
+       .unmask         = rawhide_enable_irq,
+       .mask           = rawhide_disable_irq,
+       .mask_ack       = rawhide_mask_and_ack_irq,
 };
 
 static void 
@@ -194,8 +177,8 @@ rawhide_init_irq(void)
        }
 
        for (i = 16; i < 128; ++i) {
-               irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-               irq_desc[i].chip = &rawhide_irq_type;
+               irq_to_desc(i)->status |= IRQ_LEVEL;
+               set_irq_chip_and_handler(i, &rawhide_irq_type, handle_level_irq);
        }
 
        init_i8259a_irqs();