[MIPS] IRQ cleanups

This is a big irq cleanup patch.

* Use set_irq_chip() to register irq_chip.
* Initialize .mask, .unmask, .mask_ack field.  Functions for these
  method are already exist in most case.
* Do not initialize .startup, .shutdown, .enable, .disable fields if
  default routines provided by irq_chip_set_defaults() were suitable.
* Remove redundant irq_desc initializations.
* Remove unnecessary local_irq_save/local_irq_restore, spin_lock.

With this cleanup, it would be easy to switch to slightly lightwait
irq flow handlers (handle_level_irq(), etc.) instead of __do_IRQ().

Though whole this patch is quite large, changes in each irq_chip are
not quite simple.  Please review and test on your platform.  Thanks.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 11 insertions, 34 deletions

diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index 62f011ba97a2..977538445cf3 100644
--- 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,16 +80,6 @@ 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)))
@@ -107,11 +88,10 @@ static void rm9k_cpu_irq_end(unsigned int irq)
 
 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,
+        .ack = mask_rm9k_irq,
+        .mask = mask_rm9k_irq,
+        .mask_ack = mask_rm9k_irq,
+        .unmask = unmask_rm9k_irq,
         .end = rm9k_cpu_irq_end,
 };
 
@@ -119,9 +99,10 @@ 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,
+        .ack = mask_rm9k_irq,
+        .mask = mask_rm9k_irq,
+        .mask_ack = mask_rm9k_irq,
+        .unmask = unmask_rm9k_irq,
         .end = rm9k_cpu_irq_end,
 };
 
@@ -135,15 +116,11 @@ 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].chip = &rm9k_irq_controller;
-        }
+        for (i = base; i < base + 4; i++)
+                set_irq_chip(i, &rm9k_irq_controller);
 
         rm9000_perfcount_irq = base + 1;
-        irq_desc[rm9000_perfcount_irq].chip = &rm9k_perfcounter_irq;
+        set_irq_chip(rm9000_perfcount_irq, &rm9k_perfcounter_irq);
 
         irq_base = base;
 }