Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / arch / mips / basler / excite / excite_irq.c

diff --git a/arch/mips/basler/excite/excite_irq.c b/arch/mips/basler/excite/excite_irq.c
index 511ad87..2e2061a 100644 (file)
--- a/arch/mips/basler/excite/excite_irq.c
+++ b/arch/mips/basler/excite/excite_irq.c
@@ -56,7 +56,7 @@ void __init arch_init_irq(void)
 #endif
 }
 
-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(void)
 {
        const u32
                interrupts = read_c0_cause() >> 8,
@@ -67,7 +67,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
 
        /* process timer interrupt */
        if (pending & (1 << TIMER_IRQ)) {
-               do_IRQ(TIMER_IRQ, regs);
+               do_IRQ(TIMER_IRQ);
                return;
        }
 
@@ -80,7 +80,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
 #else
        if (pending & (1 << USB_IRQ)) {
 #endif
-               do_IRQ(USB_IRQ, regs);
+               do_IRQ(USB_IRQ);
                return;
        }
 
@@ -91,9 +91,9 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
        if ((pending & (1 << TITAN_IRQ)) && msgint) {
                ocd_writel(msgint, INTP0Clear0 + (TITAN_MSGINT / 0x20 * 0x10));
 #if defined(CONFIG_KGDB)
-               excite_kgdb_inthdl(regs);
+               excite_kgdb_inthdl();
 #endif
-               do_IRQ(TITAN_IRQ, regs);
+               do_IRQ(TITAN_IRQ);
                return;
        }
 
@@ -102,7 +102,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
        msgintmask  = ocd_readl(INTP0Mask0 + (FPGA0_MSGINT / 0x20 * 0x10));
        msgint      = msgintflags & msgintmask & (0x1 << (FPGA0_MSGINT % 0x20));
        if ((pending & (1 << FPGA0_IRQ)) && msgint) {
-               do_IRQ(FPGA0_IRQ, regs);
+               do_IRQ(FPGA0_IRQ);
                return;
        }
 
@@ -111,7 +111,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
        msgintmask  = ocd_readl(INTP0Mask0 + (FPGA1_MSGINT / 0x20 * 0x10));
        msgint      = msgintflags & msgintmask & (0x1 << (FPGA1_MSGINT % 0x20));
        if ((pending & (1 << FPGA1_IRQ)) && msgint) {
-               do_IRQ(FPGA1_IRQ, regs);
+               do_IRQ(FPGA1_IRQ);
                return;
        }
 
@@ -120,10 +120,10 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
        msgintmask  = ocd_readl(INTP0Mask0 + (PHY_MSGINT / 0x20 * 0x10));
        msgint      = msgintflags & msgintmask & (0x1 << (PHY_MSGINT % 0x20));
        if ((pending & (1 << PHY_IRQ)) && msgint) {
-               do_IRQ(PHY_IRQ, regs);
+               do_IRQ(PHY_IRQ);
                return;
        }
 
        /* Process spurious interrupts */
-       spurious_interrupt(regs);
+       spurious_interrupt();
 }