Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 20 deletions

diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 270ecd3e6b4a..319f8803ef6f 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -332,34 +332,19 @@ static inline void disable_bridge_irq(unsigned int irq)
         intr_disconnect_level(cpu, swlevel);
 }
 
-static void mask_and_ack_bridge_irq(unsigned int irq)
-{
-        disable_bridge_irq(irq);
-}
-
-static void end_bridge_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)) &&
-            irq_desc[irq].action)
-                enable_bridge_irq(irq);
-}
-
 static struct irq_chip bridge_irq_type = {
         .typename       = "bridge",
         .startup        = startup_bridge_irq,
         .shutdown       = shutdown_bridge_irq,
-        .enable         = enable_bridge_irq,
-        .disable        = disable_bridge_irq,
-        .ack            = mask_and_ack_bridge_irq,
-        .end            = end_bridge_irq,
+        .ack            = disable_bridge_irq,
+        .mask           = disable_bridge_irq,
+        .mask_ack       = disable_bridge_irq,
+        .unmask         = enable_bridge_irq,
 };
 
 void __devinit register_bridge_irq(unsigned int irq)
 {
-        irq_desc[irq].status    = IRQ_DISABLED;
-        irq_desc[irq].action    = 0;
-        irq_desc[irq].depth     = 1;
-        irq_desc[irq].chip      = &bridge_irq_type;
+        set_irq_chip_and_handler(irq, &bridge_irq_type, handle_level_irq);
 }
 
 int __devinit request_bridge_irq(struct bridge_controller *bc)