1 files changed, 17 insertions, 92 deletions

diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index af518898eaa1..8e2074b4ce43 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -40,34 +40,17 @@ extern int ip22_eisa_init(void);
 
 static void enable_local0_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         /* don't allow mappable interrupt to be enabled from setup_irq,
          * we have our own way to do so */
         if (irq != SGI_MAP_0_IRQ)
                 sgint->imask0 |= (1 << (irq - SGINT_LOCAL0));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local0_irq(unsigned int irq)
-{
-        enable_local0_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 static void disable_local0_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask0 &= ~(1 << (irq - SGINT_LOCAL0));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local0_irq     disable_local0_irq
-#define mask_and_ack_local0_irq disable_local0_irq
-
 static void end_local0_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -76,44 +59,26 @@ static void end_local0_irq (unsigned int irq)
 
 static struct irq_chip ip22_local0_irq_type = {
         .typename       = "IP22 local 0",
-        .startup        = startup_local0_irq,
-        .shutdown       = shutdown_local0_irq,
-        .enable         = enable_local0_irq,
-        .disable        = disable_local0_irq,
-        .ack            = mask_and_ack_local0_irq,
+        .ack            = disable_local0_irq,
+        .mask           = disable_local0_irq,
+        .mask_ack       = disable_local0_irq,
+        .unmask         = enable_local0_irq,
         .end            = end_local0_irq,
 };
 
 static void enable_local1_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         /* don't allow mappable interrupt to be enabled from setup_irq,
          * we have our own way to do so */
         if (irq != SGI_MAP_1_IRQ)
                 sgint->imask1 |= (1 << (irq - SGINT_LOCAL1));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local1_irq(unsigned int irq)
-{
-        enable_local1_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 void disable_local1_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask1 &= ~(1 << (irq - SGINT_LOCAL1));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local1_irq     disable_local1_irq
-#define mask_and_ack_local1_irq disable_local1_irq
-
 static void end_local1_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -122,44 +87,26 @@ static void end_local1_irq (unsigned int irq)
 
 static struct irq_chip ip22_local1_irq_type = {
         .typename       = "IP22 local 1",
-        .startup        = startup_local1_irq,
-        .shutdown       = shutdown_local1_irq,
-        .enable         = enable_local1_irq,
-        .disable        = disable_local1_irq,
-        .ack            = mask_and_ack_local1_irq,
+        .ack            = disable_local1_irq,
+        .mask           = disable_local1_irq,
+        .mask_ack       = disable_local1_irq,
+        .unmask         = enable_local1_irq,
         .end            = end_local1_irq,
 };
 
 static void enable_local2_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask0 |= (1 << (SGI_MAP_0_IRQ - SGINT_LOCAL0));
         sgint->cmeimask0 |= (1 << (irq - SGINT_LOCAL2));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local2_irq(unsigned int irq)
-{
-        enable_local2_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 void disable_local2_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->cmeimask0 &= ~(1 << (irq - SGINT_LOCAL2));
         if (!sgint->cmeimask0)
                 sgint->imask0 &= ~(1 << (SGI_MAP_0_IRQ - SGINT_LOCAL0));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local2_irq disable_local2_irq
-#define mask_and_ack_local2_irq disable_local2_irq
-
 static void end_local2_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -168,44 +115,26 @@ static void end_local2_irq (unsigned int irq)
 
 static struct irq_chip ip22_local2_irq_type = {
         .typename       = "IP22 local 2",
-        .startup        = startup_local2_irq,
-        .shutdown       = shutdown_local2_irq,
-        .enable         = enable_local2_irq,
-        .disable        = disable_local2_irq,
-        .ack            = mask_and_ack_local2_irq,
+        .ack            = disable_local2_irq,
+        .mask           = disable_local2_irq,
+        .mask_ack       = disable_local2_irq,
+        .unmask         = enable_local2_irq,
         .end            = end_local2_irq,
 };
 
 static void enable_local3_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->imask1 |= (1 << (SGI_MAP_1_IRQ - SGINT_LOCAL1));
         sgint->cmeimask1 |= (1 << (irq - SGINT_LOCAL3));
-        local_irq_restore(flags);
-}
-
-static unsigned int startup_local3_irq(unsigned int irq)
-{
-        enable_local3_irq(irq);
-        return 0;               /* Never anything pending  */
 }
 
 void disable_local3_irq(unsigned int irq)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
         sgint->cmeimask1 &= ~(1 << (irq - SGINT_LOCAL3));
         if (!sgint->cmeimask1)
                 sgint->imask1 &= ~(1 << (SGI_MAP_1_IRQ - SGINT_LOCAL1));
-        local_irq_restore(flags);
 }
 
-#define shutdown_local3_irq disable_local3_irq
-#define mask_and_ack_local3_irq disable_local3_irq
-
 static void end_local3_irq (unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -214,11 +143,10 @@ static void end_local3_irq (unsigned int irq)
 
 static struct irq_chip ip22_local3_irq_type = {
         .typename       = "IP22 local 3",
-        .startup        = startup_local3_irq,
-        .shutdown       = shutdown_local3_irq,
-        .enable         = enable_local3_irq,
-        .disable        = disable_local3_irq,
-        .ack            = mask_and_ack_local3_irq,
+        .ack            = disable_local3_irq,
+        .mask           = disable_local3_irq,
+        .mask_ack       = disable_local3_irq,
+        .unmask         = enable_local3_irq,
         .end            = end_local3_irq,
 };
 
@@ -430,10 +358,7 @@ void __init arch_init_irq(void)
                 else
                         handler         = &ip22_local3_irq_type;
 
-                irq_desc[i].status      = IRQ_DISABLED;
-                irq_desc[i].action      = 0;
-                irq_desc[i].depth       = 1;
-                irq_desc[i].chip        = handler;
+                set_irq_chip(i, handler);
         }
 
         /* vector handler. this register the IRQ as non-sharable */