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

[cascardo/linux.git] / arch / arm / mach-shmobile / platsmp-scu.c

diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
index 8d478f1..d1ecaf3 100644 (file)
--- a/arch/arm/mach-shmobile/platsmp-scu.c
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -21,26 +21,14 @@
 static phys_addr_t shmobile_scu_base_phys;
 static void __iomem *shmobile_scu_base;
 
-static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
-                                         unsigned long action, void *hcpu)
+static int shmobile_scu_cpu_prepare(unsigned int cpu)
 {
-       unsigned int cpu = (long)hcpu;
-
-       switch (action) {
-       case CPU_UP_PREPARE:
-               /* For this particular CPU register SCU SMP boot vector */
-               shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
-                                 shmobile_scu_base_phys);
-               break;
-       };
-
-       return NOTIFY_OK;
+       /* For this particular CPU register SCU SMP boot vector */
+       shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
+                         shmobile_scu_base_phys);
+       return 0;
 }
 
-static struct notifier_block shmobile_smp_scu_notifier = {
-       .notifier_call = shmobile_smp_scu_notifier_call,
-};
-
 void __init shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
                                          unsigned int max_cpus)
 {
@@ -54,7 +42,9 @@ void __init shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
 
        /* Use CPU notifier for reset vector control */
-       register_cpu_notifier(&shmobile_smp_scu_notifier);
+       cpuhp_setup_state_nocalls(CPUHP_ARM_SHMOBILE_SCU_PREPARE,
+                                 "arm/shmobile-scu:prepare",
+                                 shmobile_scu_cpu_prepare, NULL);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU