Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / mach-omap2 / omap-wakeupgen.c

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index 0c47543..369f95a 100644 (file)
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -322,34 +322,25 @@ static void irq_save_secure_context(void)
 #endif
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int irq_cpu_hotplug_notify(struct notifier_block *self,
-                                 unsigned long action, void *hcpu)
+static int omap_wakeupgen_cpu_online(unsigned int cpu)
 {
-       unsigned int cpu = (unsigned int)hcpu;
-
-       /*
-        * Corresponding FROZEN transitions do not have to be handled,
-        * they are handled by at a higher level
-        * (drivers/cpuidle/coupled.c).
-        */
-       switch (action) {
-       case CPU_ONLINE:
-               wakeupgen_irqmask_all(cpu, 0);
-               break;
-       case CPU_DEAD:
-               wakeupgen_irqmask_all(cpu, 1);
-               break;
-       }
-       return NOTIFY_OK;
+       wakeupgen_irqmask_all(cpu, 0);
+       return 0;
 }
 
-static struct notifier_block irq_hotplug_notifier = {
-       .notifier_call = irq_cpu_hotplug_notify,
-};
+static int omap_wakeupgen_cpu_dead(unsigned int cpu)
+{
+       wakeupgen_irqmask_all(cpu, 1);
+       return 0;
+}
 
 static void __init irq_hotplug_init(void)
 {
-       register_hotcpu_notifier(&irq_hotplug_notifier);
+       cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "arm/omap-wake:online",
+                                 omap_wakeupgen_cpu_online, NULL);
+       cpuhp_setup_state_nocalls(CPUHP_ARM_OMAP_WAKE_DEAD,
+                                 "arm/omap-wake:dead", NULL,
+                                 omap_wakeupgen_cpu_dead);
 }
 #else
 static void __init irq_hotplug_init(void)