Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / mips / momentum / ocelot_c / irq.c

diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c
index 9d44ae1e156b65b698afa0c6a284e9b19491fd33..40472f7944d792cf3b69fbe72559db7cb5482108 100644 (file)
--- a/arch/mips/momentum/ocelot_c/irq.c
+++ b/arch/mips/momentum/ocelot_c/irq.c
@@ -59,31 +59,31 @@ static struct irqaction cascade_mv64340 = {
        no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL
 };
 
-extern void ll_uart_irq(struct pt_regs *regs);
-extern void ll_cpci_irq(struct pt_regs *regs);
+extern void ll_uart_irq(void);
+extern void ll_cpci_irq(void);
 
-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(void)
 {
        unsigned int pending = read_c0_cause() & read_c0_status();
 
        if (pending & STATUSF_IP0)
-               do_IRQ(0, regs);
+               do_IRQ(0);
        else if (pending & STATUSF_IP1)
-               do_IRQ(1, regs);
+               do_IRQ(1);
        else if (pending & STATUSF_IP2)
-               do_IRQ(2, regs);
+               do_IRQ(2);
        else if (pending & STATUSF_IP3)
-               ll_uart_irq(regs);
+               ll_uart_irq();
        else if (pending & STATUSF_IP4)
-               do_IRQ(4, regs);
+               do_IRQ(4);
        else if (pending & STATUSF_IP5)
-               ll_cpci_irq(regs);
+               ll_cpci_irq();
        else if (pending & STATUSF_IP6)
-               ll_mv64340_irq(regs);
+               ll_mv64340_irq();
        else if (pending & STATUSF_IP7)
-               do_IRQ(7, regs);
+               do_IRQ(7);
        else
-               spurious_interrupt(regs);
+               spurious_interrupt();
 }
 
 void __init arch_init_irq(void)
@@ -94,7 +94,7 @@ void __init arch_init_irq(void)
         */
        clear_c0_status(ST0_IM);
 
-       mips_cpu_irq_init(0);
+       mips_cpu_irq_init();
 
        /* set up the cascading interrupts */
        setup_irq(3, &cascade_fpga);