1 files changed, 3 insertions, 30 deletions

diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c
index 685ecc2ed551..6377bd8a9050 100644
--- a/arch/mips/txx9/generic/irq_tx4927.c
+++ b/arch/mips/txx9/generic/irq_tx4927.c
@@ -26,39 +26,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#ifdef CONFIG_TOSHIBA_RBTX4927
-#include <asm/txx9/rbtx4927.h>
-#endif
+#include <asm/txx9/tx4927.h>
 
 void __init tx4927_irq_init(void)
 {
         mips_cpu_irq_init();
         txx9_irq_init(TX4927_IRC_REG);
-        set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
-
-        if (pending & STATUSF_IP7)                      /* cpu timer */
-                do_IRQ(TX4927_IRQ_CPU_TIMER);
-        else if (pending & STATUSF_IP2) {               /* tx4927 pic */
-                int irq = txx9_irq();
-#ifdef CONFIG_TOSHIBA_RBTX4927
-                if (irq == TX4927_IRQ_NEST_EXT_ON_PIC)
-                        irq = toshiba_rbtx4927_irq_nested(irq);
-#endif
-                if (unlikely(irq < 0)) {
-                        spurious_interrupt();
-                        return;
-                }
-                do_IRQ(irq);
-        } else if (pending & STATUSF_IP0)               /* user line 0 */
-                do_IRQ(TX4927_IRQ_USER0);
-        else if (pending & STATUSF_IP1)                 /* user line 1 */
-                do_IRQ(TX4927_IRQ_USER1);
-        else
-                spurious_interrupt();
+        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT,
+                                handle_simple_irq);
 }