Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / irq-mb93493.c

diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c
index 8ad9abfc7c1355ffc9fe32b9295d0c397d52c973..7754c7338e4b42cfaeb4c3a76158665f3b05d275 100644 (file)
--- a/arch/frv/kernel/irq-mb93493.c
+++ b/arch/frv/kernel/irq-mb93493.c
@@ -17,10 +17,10 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
 #include <asm/irc-regs.h>
@@ -43,8 +43,9 @@
 
 /*
  * daughter board PIC operations
+ * - there is no way to ACK interrupts in the MB93493 chip
  */
-static void frv_mb93493_enable(unsigned int irq)
+static void frv_mb93493_mask(unsigned int irq)
 {
        uint32_t iqsr;
        volatile void *piqsr;
@@ -55,11 +56,15 @@ static void frv_mb93493_enable(unsigned int irq)
                piqsr = __addr_MB93493_IQSR(0);
 
        iqsr = readl(piqsr);
-       iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16);
+       iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16));
        writel(iqsr, piqsr);
 }
 
-static void frv_mb93493_disable(unsigned int irq)
+static void frv_mb93493_ack(unsigned int irq)
+{
+}
+
+static void frv_mb93493_unmask(unsigned int irq)
 {
        uint32_t iqsr;
        volatile void *piqsr;
@@ -70,35 +75,24 @@ static void frv_mb93493_disable(unsigned int irq)
                piqsr = __addr_MB93493_IQSR(0);
 
        iqsr = readl(piqsr);
-       iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16));
+       iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16);
        writel(iqsr, piqsr);
 }
 
-static void frv_mb93493_ack(unsigned int irq)
-{
-}
-
-static void frv_mb93493_end(unsigned int irq)
-{
-}
-
 static struct irq_chip frv_mb93493_pic = {
        .name           = "mb93093",
-       .enable         = frv_mb93493_enable,
-       .disable        = frv_mb93493_disable,
        .ack            = frv_mb93493_ack,
-       .mask           = frv_mb93493_disable,
-       .unmask         = frv_mb93493_enable,
-       .end            = frv_mb93493_end,
+       .mask           = frv_mb93493_mask,
+       .mask_ack       = frv_mb93493_mask,
+       .unmask         = frv_mb93493_unmask,
 };
 
 /*
  * MB93493 PIC interrupt handler
  */
-static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs)
+static irqreturn_t mb93493_interrupt(int irq, void *_piqsr)
 {
        volatile void *piqsr = _piqsr;
-       irqreturn_t iret = 0;
        uint32_t iqsr;
 
        iqsr = readl(piqsr);
@@ -112,11 +106,10 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs
                irq = 31 - irq;
                iqsr &= ~(1 << irq);
 
-               if (__do_IRQ(IRQ_BASE_MB93493 + irq, regs))
-                       iret |= IRQ_HANDLED;
+               generic_handle_irq(IRQ_BASE_MB93493 + irq);
        }
 
-       return iret;
+       return IRQ_HANDLED;
 }
 
 /*