1 files changed, 1 insertions, 17 deletions

diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 0833736afa32..65a1ecd77f96 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -217,19 +217,6 @@ void __init init_IRQ(void)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu)
-{
-        struct irq_desc *desc = irq_to_desc(irq);
-        struct irq_chip *chip = irq_data_get_irq_chip(data);
-
-        printk(KERN_INFO "IRQ%u: moving from cpu%u to cpu%u\n",
-               irq, data->node, cpu);
-
-        raw_spin_lock_irq(&desc->lock);
-        chip->irq_set_affinity(data, cpumask_of(cpu), false);
-        raw_spin_unlock_irq(&desc->lock);
-}
-
 /*
  * The CPU has been marked offline.  Migrate IRQs off this CPU.  If
  * the affinity settings do not allow other CPUs, force them onto any
@@ -250,11 +237,8 @@ void migrate_irqs(void)
                                                     irq, cpu);
 
                                 cpumask_setall(data->affinity);
-                                newcpu = cpumask_any_and(data->affinity,
-                                                         cpu_online_mask);
                         }
-
-                        route_irq(data, irq, newcpu);
+                        irq_set_affinity(irq, data->affinity);
                 }
         }
 }