1 files changed, 7 insertions, 54 deletions

diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index 6b54c7109e2e..123324ba8c14 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -29,56 +29,12 @@ static inline void mask_rm7k_irq(unsigned int irq)
         clear_c0_intcontrol(0x100 << (irq - irq_base));
 }
 
-static inline void rm7k_cpu_irq_enable(unsigned int irq)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        unmask_rm7k_irq(irq);
-        local_irq_restore(flags);
-}
-
-static void rm7k_cpu_irq_disable(unsigned int irq)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        mask_rm7k_irq(irq);
-        local_irq_restore(flags);
-}
-
-static unsigned int rm7k_cpu_irq_startup(unsigned int irq)
-{
-        rm7k_cpu_irq_enable(irq);
-
-        return 0;
-}
-
-#define rm7k_cpu_irq_shutdown   rm7k_cpu_irq_disable
-
-/*
- * While we ack the interrupt interrupts are disabled and thus we don't need
- * to deal with concurrency issues.  Same for rm7k_cpu_irq_end.
- */
-static void rm7k_cpu_irq_ack(unsigned int irq)
-{
-        mask_rm7k_irq(irq);
-}
-
-static void rm7k_cpu_irq_end(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                unmask_rm7k_irq(irq);
-}
-
 static struct irq_chip rm7k_irq_controller = {
         .typename = "RM7000",
-        .startup = rm7k_cpu_irq_startup,
-        .shutdown = rm7k_cpu_irq_shutdown,
-        .enable = rm7k_cpu_irq_enable,
-        .disable = rm7k_cpu_irq_disable,
-        .ack = rm7k_cpu_irq_ack,
-        .end = rm7k_cpu_irq_end,
+        .ack = mask_rm7k_irq,
+        .mask = mask_rm7k_irq,
+        .mask_ack = mask_rm7k_irq,
+        .unmask = unmask_rm7k_irq,
 };
 
 void __init rm7k_cpu_irq_init(int base)
@@ -87,12 +43,9 @@ void __init rm7k_cpu_irq_init(int base)
 
         clear_c0_intcontrol(0x00000f00);                /* 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].chip = &rm7k_irq_controller;
-        }
+        for (i = base; i < base + 4; i++)
+                set_irq_chip_and_handler(i, &rm7k_irq_controller,
+                                         handle_level_irq);
 
         irq_base = base;
 }