MIPS: Convert the irq functions to the new names

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

7 files changed, 16 insertions, 15 deletions

diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c
index e1828e8bcaef..7e3ac5782da4 100644
--- a/arch/mips/txx9/generic/irq_tx4927.c
+++ b/arch/mips/txx9/generic/irq_tx4927.c
@@ -35,7 +35,7 @@ void __init tx4927_irq_init(void)
 
         mips_cpu_irq_init();
         txx9_irq_init(TX4927_IRC_REG & 0xfffffffffULL);
-        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT,
+        irq_set_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT,
                                 handle_simple_irq);
         /* raise priority for errors, timers, SIO */
         txx9_irq_set_pri(TX4927_IR_ECCERR, 7);
diff --git a/arch/mips/txx9/generic/irq_tx4938.c b/arch/mips/txx9/generic/irq_tx4938.c
index a6e6e805097a..aace85653329 100644
--- a/arch/mips/txx9/generic/irq_tx4938.c
+++ b/arch/mips/txx9/generic/irq_tx4938.c
@@ -23,7 +23,7 @@ void __init tx4938_irq_init(void)
 
         mips_cpu_irq_init();
         txx9_irq_init(TX4938_IRC_REG & 0xfffffffffULL);
-        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4938_IRC_INT,
+        irq_set_chained_handler(MIPS_CPU_IRQ_BASE + TX4938_IRC_INT,
                                 handle_simple_irq);
         /* raise priority for errors, timers, SIO */
         txx9_irq_set_pri(TX4938_IR_ECCERR, 7);
diff --git a/arch/mips/txx9/generic/irq_tx4939.c b/arch/mips/txx9/generic/irq_tx4939.c
index 93b6edbedd64..6b067dbd2ae1 100644
--- a/arch/mips/txx9/generic/irq_tx4939.c
+++ b/arch/mips/txx9/generic/irq_tx4939.c
@@ -176,8 +176,8 @@ void __init tx4939_irq_init(void)
         for (i = 1; i < TX4939_NUM_IR; i++) {
                 tx4939irq[i].level = 4; /* middle level */
                 tx4939irq[i].mode = TXx9_IRCR_LOW;
-                set_irq_chip_and_handler(TXX9_IRQ_BASE + i,
-                                         &tx4939_irq_chip, handle_level_irq);
+                irq_set_chip_and_handler(TXX9_IRQ_BASE + i, &tx4939_irq_chip,
+                                         handle_level_irq);
         }
 
         /* mask all IRC interrupts */
@@ -193,7 +193,7 @@ void __init tx4939_irq_init(void)
         __raw_writel(TXx9_IRCER_ICE, &tx4939_ircptr->den.r);
         __raw_writel(irc_elevel, &tx4939_ircptr->msk.r);
 
-        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4939_IRC_INT,
+        irq_set_chained_handler(MIPS_CPU_IRQ_BASE + TX4939_IRC_INT,
                                 handle_simple_irq);
 
         /* raise priority for errors, timers, sio */
diff --git a/arch/mips/txx9/jmr3927/irq.c b/arch/mips/txx9/jmr3927/irq.c
index 92a5c1b400f0..c22c859a2c49 100644
--- a/arch/mips/txx9/jmr3927/irq.c
+++ b/arch/mips/txx9/jmr3927/irq.c
@@ -120,8 +120,9 @@ void __init jmr3927_irq_setup(void)
 
         tx3927_irq_init();
         for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)
-                set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq);
+                irq_set_chip_and_handler(i, &jmr3927_irq_ioc,
+                                         handle_level_irq);
 
         /* setup IOC interrupt 1 (PCI, MODEM) */
-        set_irq_chained_handler(JMR3927_IRQ_IOCINT, handle_simple_irq);
+        irq_set_chained_handler(JMR3927_IRQ_IOCINT, handle_simple_irq);
 }
diff --git a/arch/mips/txx9/rbtx4927/irq.c b/arch/mips/txx9/rbtx4927/irq.c
index 7c0a048b307c..6c22c496090b 100644
--- a/arch/mips/txx9/rbtx4927/irq.c
+++ b/arch/mips/txx9/rbtx4927/irq.c
@@ -164,9 +164,9 @@ static void __init toshiba_rbtx4927_irq_ioc_init(void)
 
         for (i = RBTX4927_IRQ_IOC;
              i < RBTX4927_IRQ_IOC + RBTX4927_NR_IRQ_IOC; i++)
-                set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_ioc_type,
+                irq_set_chip_and_handler(i, &toshiba_rbtx4927_irq_ioc_type,
                                          handle_level_irq);
-        set_irq_chained_handler(RBTX4927_IRQ_IOCINT, handle_simple_irq);
+        irq_set_chained_handler(RBTX4927_IRQ_IOCINT, handle_simple_irq);
 }
 
 static int rbtx4927_irq_dispatch(int pending)
@@ -194,5 +194,5 @@ void __init rbtx4927_irq_setup(void)
         tx4927_irq_init();
         toshiba_rbtx4927_irq_ioc_init();
         /* Onboard 10M Ether: High Active */
-        set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);
+        irq_set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);
 }
diff --git a/arch/mips/txx9/rbtx4938/irq.c b/arch/mips/txx9/rbtx4938/irq.c
index 2ec4fe1b1670..58cd7a9272cc 100644
--- a/arch/mips/txx9/rbtx4938/irq.c
+++ b/arch/mips/txx9/rbtx4938/irq.c
@@ -132,10 +132,10 @@ static void __init toshiba_rbtx4938_irq_ioc_init(void)
 
         for (i = RBTX4938_IRQ_IOC;
              i < RBTX4938_IRQ_IOC + RBTX4938_NR_IRQ_IOC; i++)
-                set_irq_chip_and_handler(i, &toshiba_rbtx4938_irq_ioc_type,
+                irq_set_chip_and_handler(i, &toshiba_rbtx4938_irq_ioc_type,
                                          handle_level_irq);
 
-        set_irq_chained_handler(RBTX4938_IRQ_IOCINT, handle_simple_irq);
+        irq_set_chained_handler(RBTX4938_IRQ_IOCINT, handle_simple_irq);
 }
 
 void __init rbtx4938_irq_setup(void)
@@ -153,5 +153,5 @@ void __init rbtx4938_irq_setup(void)
         tx4938_irq_init();
         toshiba_rbtx4938_irq_ioc_init();
         /* Onboard 10M Ether: High Active */
-        set_irq_type(RBTX4938_IRQ_ETHER, IRQF_TRIGGER_HIGH);
+        irq_set_irq_type(RBTX4938_IRQ_ETHER, IRQF_TRIGGER_HIGH);
 }
diff --git a/arch/mips/txx9/rbtx4939/irq.c b/arch/mips/txx9/rbtx4939/irq.c
index 70074632fb99..69a80616f0c9 100644
--- a/arch/mips/txx9/rbtx4939/irq.c
+++ b/arch/mips/txx9/rbtx4939/irq.c
@@ -88,8 +88,8 @@ void __init rbtx4939_irq_setup(void)
         tx4939_irq_init();
         for (i = RBTX4939_IRQ_IOC;
              i < RBTX4939_IRQ_IOC + RBTX4939_NR_IRQ_IOC; i++)
-                set_irq_chip_and_handler(i, &rbtx4939_ioc_irq_chip,
+                irq_set_chip_and_handler(i, &rbtx4939_ioc_irq_chip,
                                          handle_level_irq);
 
-        set_irq_chained_handler(RBTX4939_IRQ_IOCINT, handle_simple_irq);
+        irq_set_chained_handler(RBTX4939_IRQ_IOCINT, handle_simple_irq);
 }