Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus

[pandora-kernel.git] / arch / mips / kernel / irq_txx9.c

diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c
index 172e14b..9b78029 100644 (file)
--- a/arch/mips/kernel/irq_txx9.c
+++ b/arch/mips/kernel/irq_txx9.c
@@ -1,6 +1,4 @@
 /*
- * linux/arch/mips/kernel/irq_txx9.c
- *
  * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c,
  *          linux/arch/mips/tx4927/common/tx4927_irq.c,
  *          linux/arch/mips/tx4938/common/irq.c
@@ -105,13 +103,9 @@ static void txx9_irq_mask_ack(unsigned int irq)
        unsigned int irq_nr = irq - TXX9_IRQ_BASE;
 
        txx9_irq_mask(irq);
-       if (TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)) {
-               /* clear edge detection */
-               u32 cr = __raw_readl(&txx9_ircptr->cr[irq_nr / 8]);
-               cr = (cr >> ((irq_nr & (8 - 1)) * 2)) & 3;
-               __raw_writel(TXx9_IRSCR_EIClrE | irq_nr,
-                            &txx9_ircptr->scr);
-       }
+       /* clear edge detection */
+       if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)))
+               __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr);
 }
 
 static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type)