Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / mips / lasat / interrupt.c

diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 2d3472b21ebbe3ad62b98ff3046380b0039107a3..2affa5ff171c763e76067f96b2c7925a82b4e47d 100644 (file)
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -36,47 +36,20 @@ static volatile int lasat_int_mask_shift;
 
 void disable_lasat_irq(unsigned int irq_nr)
 {
-       unsigned long flags;
-
-       local_irq_save(flags);
        *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
-       local_irq_restore(flags);
 }
 
 void enable_lasat_irq(unsigned int irq_nr)
 {
-       unsigned long flags;
-
-       local_irq_save(flags);
        *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
-       local_irq_restore(flags);
-}
-
-static unsigned int startup_lasat_irq(unsigned int irq)
-{
-       enable_lasat_irq(irq);
-
-       return 0; /* never anything pending */
 }
 
-#define shutdown_lasat_irq     disable_lasat_irq
-
-#define mask_and_ack_lasat_irq disable_lasat_irq
-
-static void end_lasat_irq(unsigned int irq)
-{
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-               enable_lasat_irq(irq);
-}
-
-static struct hw_interrupt_type lasat_irq_type = {
+static struct irq_chip lasat_irq_type = {
        .typename = "Lasat",
-       .startup = startup_lasat_irq,
-       .shutdown = shutdown_lasat_irq,
-       .enable = enable_lasat_irq,
-       .disable = disable_lasat_irq,
-       .ack = mask_and_ack_lasat_irq,
-       .end = end_lasat_irq,
+       .ack = disable_lasat_irq,
+       .mask = disable_lasat_irq,
+       .mask_ack = disable_lasat_irq,
+       .unmask = enable_lasat_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
@@ -108,14 +81,14 @@ static unsigned long get_int_status_200(void)
        return int_status;
 }
 
-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(void)
 {
        unsigned long int_status;
        unsigned int cause = read_c0_cause();
        int irq;
 
        if (cause & CAUSEF_IP7) {       /* R4000 count / compare IRQ */
-               ll_timer_interrupt(7, regs);
+               ll_timer_interrupt(7);
                return;
        }
 
@@ -125,7 +98,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
        if (int_status) {
                irq = ls1bit32(int_status);
 
-               do_IRQ(irq, regs);
+               do_IRQ(irq);
        }
 }
 
@@ -152,10 +125,6 @@ void __init arch_init_irq(void)
                panic("arch_init_irq: mips_machtype incorrect");
        }
 
-       for (i = 0; i <= LASATINT_END; i++) {
-               irq_desc[i].status      = IRQ_DISABLED;
-               irq_desc[i].action      = 0;
-               irq_desc[i].depth       = 1;
-               irq_desc[i].handler     = &lasat_irq_type;
-       }
+       for (i = 0; i <= LASATINT_END; i++)
+               set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
 }