diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/irq_txx9.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c index 172e14b461df..a4d1462c27f7 100644 --- a/arch/mips/kernel/irq_txx9.c +++ b/arch/mips/kernel/irq_txx9.c | |||
@@ -105,13 +105,9 @@ static void txx9_irq_mask_ack(unsigned int irq) | |||
105 | unsigned int irq_nr = irq - TXX9_IRQ_BASE; | 105 | unsigned int irq_nr = irq - TXX9_IRQ_BASE; |
106 | 106 | ||
107 | txx9_irq_mask(irq); | 107 | txx9_irq_mask(irq); |
108 | if (TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)) { | 108 | /* clear edge detection */ |
109 | /* clear edge detection */ | 109 | if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode))) |
110 | u32 cr = __raw_readl(&txx9_ircptr->cr[irq_nr / 8]); | 110 | __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr); |
111 | cr = (cr >> ((irq_nr & (8 - 1)) * 2)) & 3; | ||
112 | __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, | ||
113 | &txx9_ircptr->scr); | ||
114 | } | ||
115 | } | 111 | } |
116 | 112 | ||
117 | static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type) | 113 | static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type) |