[MIPS] Complete fixes after removal of pt_regs argument to int handlers.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 10 insertions, 10 deletions

diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index cd176f6a06c8..8266a88a3f88 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -576,24 +576,24 @@ static int tx4927_irq_nested(void)
         return (sw_irq);
 }
 
-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(void)
 {
         unsigned int pending = read_c0_status() & read_c0_cause();
 
         if (pending & STATUSF_IP7)                      /* cpu timer */
-                do_IRQ(TX4927_IRQ_CPU_TIMER, regs);
+                do_IRQ(TX4927_IRQ_CPU_TIMER);
         else if (pending & STATUSF_IP2) {               /* tx4927 pic */
                 unsigned int irq = tx4927_irq_nested();
 
                 if (unlikely(irq == 0)) {
-                        spurious_interrupt(regs);
+                        spurious_interrupt();
                         return;
                 }
-                do_IRQ(irq, regs);
+                do_IRQ(irq);
         } else if (pending & STATUSF_IP0)               /* user line 0 */
-                do_IRQ(TX4927_IRQ_USER0, regs);
+                do_IRQ(TX4927_IRQ_USER0);
         else if (pending & STATUSF_IP1)                 /* user line 1 */
-                do_IRQ(TX4927_IRQ_USER1, regs);
+                do_IRQ(TX4927_IRQ_USER1);
         else
-                spurious_interrupt(regs);
+                spurious_interrupt();
 }
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index f0d70c476005..bea19098ac28 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -58,6 +58,7 @@
 #include <asm/page.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/irq_regs.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/reboot.h>
@@ -160,8 +161,7 @@ int tx4927_pci66 = 0;		/* 0:auto */
 char *toshiba_name = "";
 
 #ifdef CONFIG_PCI
-static void tx4927_pcierr_interrupt(int irq, void *dev_id,
-                                    struct pt_regs *regs)
+static void tx4927_pcierr_interrupt(int irq, void *dev_id)
 {
 #ifdef CONFIG_BLK_DEV_IDEPCI
         /* ignore MasterAbort for ide probing... */
@@ -185,7 +185,7 @@ static void tx4927_pcierr_interrupt(int irq, void *dev_id,
                (unsigned long) tx4927_ccfgptr->ccfg,
                (unsigned long) (tx4927_ccfgptr->tear >> 32),
                (unsigned long) tx4927_ccfgptr->tear);
-        show_regs(regs);
+        show_regs(get_irq_regs());
 }
 
 void __init toshiba_rbtx4927_pci_irq_init(void)