fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / mips / kernel / irq-rm9000.c

diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index 9b5f20c..0e6f4c5 100644 (file)
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -48,15 +48,6 @@ static void rm9k_cpu_irq_disable(unsigned int irq)
        local_irq_restore(flags);
 }
 
-static unsigned int rm9k_cpu_irq_startup(unsigned int irq)
-{
-       rm9k_cpu_irq_enable(irq);
-
-       return 0;
-}
-
-#define        rm9k_cpu_irq_shutdown   rm9k_cpu_irq_disable
-
 /*
  * Performance counter interrupts are global on all processors.
  */
@@ -89,40 +80,22 @@ static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
        on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1);
 }
 
-
-/*
- * While we ack the interrupt interrupts are disabled and thus we don't need
- * to deal with concurrency issues.  Same for rm9k_cpu_irq_end.
- */
-static void rm9k_cpu_irq_ack(unsigned int irq)
-{
-       mask_rm9k_irq(irq);
-}
-
-static void rm9k_cpu_irq_end(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-               unmask_rm9k_irq(irq);
-}
-
-static hw_irq_controller rm9k_irq_controller = {
+static struct irq_chip rm9k_irq_controller = {
        .typename = "RM9000",
-       .startup = rm9k_cpu_irq_startup,
-       .shutdown = rm9k_cpu_irq_shutdown,
-       .enable = rm9k_cpu_irq_enable,
-       .disable = rm9k_cpu_irq_disable,
-       .ack = rm9k_cpu_irq_ack,
-       .end = rm9k_cpu_irq_end,
+       .ack = mask_rm9k_irq,
+       .mask = mask_rm9k_irq,
+       .mask_ack = mask_rm9k_irq,
+       .unmask = unmask_rm9k_irq,
 };
 
-static hw_irq_controller rm9k_perfcounter_irq = {
+static struct irq_chip rm9k_perfcounter_irq = {
        .typename = "RM9000",
        .startup = rm9k_perfcounter_irq_startup,
        .shutdown = rm9k_perfcounter_irq_shutdown,
-       .enable = rm9k_cpu_irq_enable,
-       .disable = rm9k_cpu_irq_disable,
-       .ack = rm9k_cpu_irq_ack,
-       .end = rm9k_cpu_irq_end,
+       .ack = mask_rm9k_irq,
+       .mask = mask_rm9k_irq,
+       .mask_ack = mask_rm9k_irq,
+       .unmask = unmask_rm9k_irq,
 };
 
 unsigned int rm9000_perfcount_irq;
@@ -135,15 +108,13 @@ void __init rm9k_cpu_irq_init(int base)
 
        clear_c0_intcontrol(0x0000f000);                /* Mask all */
 
-       for (i = base; i < base + 4; i++) {
-               irq_desc[i].status = IRQ_DISABLED;
-               irq_desc[i].action = NULL;
-               irq_desc[i].depth = 1;
-               irq_desc[i].handler = &rm9k_irq_controller;
-       }
+       for (i = base; i < base + 4; i++)
+               set_irq_chip_and_handler(i, &rm9k_irq_controller,
+                                        handle_level_irq);
 
        rm9000_perfcount_irq = base + 1;
-       irq_desc[rm9000_perfcount_irq].handler = &rm9k_perfcounter_irq;
+       set_irq_chip_and_handler(rm9000_perfcount_irq, &rm9k_perfcounter_irq,
+                                handle_level_irq);
 
        irq_base = base;
 }