m68k: Convert irq function namespace

Scripted with coccinelle.

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

3 files changed, 13 insertions, 13 deletions

diff --git a/arch/m68k/platform/coldfire/intc-2.c b/arch/m68k/platform/coldfire/intc-2.c
index 2cbfbf035db9..74b55cfbc3cb 100644
--- a/arch/m68k/platform/coldfire/intc-2.c
+++ b/arch/m68k/platform/coldfire/intc-2.c
@@ -164,7 +164,7 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)
         }
 
         if (tb)
-                set_irq_handler(irq, handle_edge_irq);
+                irq_set_handler(irq, handle_edge_irq);
 
         irq -= EINT0;
         pa = __raw_readw(MCFEPORT_EPPAR);
@@ -204,11 +204,11 @@ void __init init_IRQ(void)
 
         for (irq = MCFINT_VECBASE; (irq < MCFINT_VECBASE + NR_VECS); irq++) {
                 if ((irq >= EINT1) && (irq <=EINT7))
-                        set_irq_chip(irq, &intc_irq_chip_edge_port);
+                        irq_set_chip(irq, &intc_irq_chip_edge_port);
                 else
-                        set_irq_chip(irq, &intc_irq_chip);
-                set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
-                set_irq_handler(irq, handle_level_irq);
+                        irq_set_chip(irq, &intc_irq_chip);
+                irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
+                irq_set_handler(irq, handle_level_irq);
         }
 }
 
diff --git a/arch/m68k/platform/coldfire/intc-simr.c b/arch/m68k/platform/coldfire/intc-simr.c
index e642b24ab729..d6a4d9d53e42 100644
--- a/arch/m68k/platform/coldfire/intc-simr.c
+++ b/arch/m68k/platform/coldfire/intc-simr.c
@@ -141,7 +141,7 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)
         }
 
         if (tb)
-                set_irq_handler(irq, handle_edge_irq);
+                irq_set_handler(irq, handle_edge_irq);
 
         ebit = irq2ebit(irq) * 2;
         pa = __raw_readw(MCFEPORT_EPPAR);
@@ -181,11 +181,11 @@ void __init init_IRQ(void)
         eirq = MCFINT_VECBASE + 64 + (MCFINTC1_ICR0 ? 64 : 0);
         for (irq = MCFINT_VECBASE; (irq < eirq); irq++) {
                 if ((irq >= EINT1) && (irq <= EINT7))
-                        set_irq_chip(irq, &intc_irq_chip_edge_port);
+                        irq_set_chip(irq, &intc_irq_chip_edge_port);
                 else
-                        set_irq_chip(irq, &intc_irq_chip);
-                set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
-                set_irq_handler(irq, handle_level_irq);
+                        irq_set_chip(irq, &intc_irq_chip);
+                irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
+                irq_set_handler(irq, handle_level_irq);
         }
 }
 
diff --git a/arch/m68k/platform/coldfire/intc.c b/arch/m68k/platform/coldfire/intc.c
index d648081a63f6..c28a6ed6cb23 100644
--- a/arch/m68k/platform/coldfire/intc.c
+++ b/arch/m68k/platform/coldfire/intc.c
@@ -143,9 +143,9 @@ void __init init_IRQ(void)
         mcf_maskimr(0xffffffff);
 
         for (irq = 0; (irq < NR_IRQS); irq++) {
-                set_irq_chip(irq, &intc_irq_chip);
-                set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
-                set_irq_handler(irq, handle_level_irq);
+                irq_set_chip(irq, &intc_irq_chip);
+                irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
+                irq_set_handler(irq, handle_level_irq);
         }
 }