OSDN Git Service

ARM: EXYNOS: Remove ifdef for scu_enable in pm
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Thu, 8 May 2014 21:53:26 +0000 (06:53 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sun, 25 May 2014 20:21:07 +0000 (05:21 +0900)
The scu_enable function is already a noop in the scu's header file is
CONFIG_SMP=n, so no need to use these macros in the code.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-exynos/pm.c

index fb1d916..24c638d 100644 (file)
@@ -310,7 +310,7 @@ static void exynos_pm_resume(void)
 
        s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
-       if (IS_ENABLED(CONFIG_SMP) && !soc_is_exynos5250())
+       if (!soc_is_exynos5250())
                scu_enable(S5P_VA_SCU);
 
 early_wakeup:
@@ -401,10 +401,8 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
 
        case CPU_PM_EXIT:
                if (cpu == 0) {
-#ifdef CONFIG_SMP
                        if (!soc_is_exynos5250())
                                scu_enable(S5P_VA_SCU);
-#endif
                        exynos_cpu_restore_register();
                }
                break;