1 files changed, 6 insertions, 21 deletions

diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index d5bd6b3a0933..5c4f50cdf157 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -28,14 +28,6 @@ static void enable_r4030_irq(unsigned int irq)
         spin_unlock_irqrestore(&r4030_lock, flags);
 }
 
-static unsigned int startup_r4030_irq(unsigned int irq)
-{
-        enable_r4030_irq(irq);
-        return 0; /* never anything pending */
-}
-
-#define shutdown_r4030_irq      disable_r4030_irq
-
 void disable_r4030_irq(unsigned int irq)
 {
         unsigned int mask = ~(1 << (irq - JAZZ_PARALLEL_IRQ));
@@ -47,8 +39,6 @@ void disable_r4030_irq(unsigned int irq)
         spin_unlock_irqrestore(&r4030_lock, flags);
 }
 
-#define mask_and_ack_r4030_irq disable_r4030_irq
-
 static void end_r4030_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
@@ -57,11 +47,10 @@ static void end_r4030_irq(unsigned int irq)
 
 static struct irq_chip r4030_irq_type = {
         .typename = "R4030",
-        .startup = startup_r4030_irq,
-        .shutdown = shutdown_r4030_irq,
-        .enable = enable_r4030_irq,
-        .disable = disable_r4030_irq,
-        .ack = mask_and_ack_r4030_irq,
+        .ack = disable_r4030_irq,
+        .mask = disable_r4030_irq,
+        .mask_ack = disable_r4030_irq,
+        .unmask = enable_r4030_irq,
         .end = end_r4030_irq,
 };
 
@@ -69,12 +58,8 @@ void __init init_r4030_ints(void)
 {
         int i;
 
-        for (i = JAZZ_PARALLEL_IRQ; i <= JAZZ_TIMER_IRQ; i++) {
-                irq_desc[i].status     = IRQ_DISABLED;
-                irq_desc[i].action     = 0;
-                irq_desc[i].depth      = 1;
-                irq_desc[i].chip    = &r4030_irq_type;
-        }
+        for (i = JAZZ_PARALLEL_IRQ; i <= JAZZ_TIMER_IRQ; i++)
+                set_irq_chip_and_handler(i, &r4030_irq_type, handle_level_irq);
 
         r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);
         r4030_read_reg16(JAZZ_IO_IRQ_SOURCE);           /* clear pending IRQs */