From e2619d4028153ed01ee67d3086faefb6d144c727 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Fri, 3 Aug 2007 23:33:38 +0900 Subject: [PATCH] --- yaml --- r: 64482 b: refs/heads/master c: 5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/irq_txx9.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e8e9319ca587..589ba1ff4607 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c76988b813ae7a9fa2282032effa6f5a66dd8d2 +refs/heads/master: 5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a diff --git a/trunk/arch/mips/kernel/irq_txx9.c b/trunk/arch/mips/kernel/irq_txx9.c index 172e14b461df..a4d1462c27f7 100644 --- a/trunk/arch/mips/kernel/irq_txx9.c +++ b/trunk/arch/mips/kernel/irq_txx9.c @@ -105,13 +105,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)