diff options
-rw-r--r-- | arch/arm/mach-exynos/suspend.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index 3800fd3d7760..89a6d3fb3284 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c | |||
@@ -63,8 +63,6 @@ static struct sleep_save exynos_core_save[] = { | |||
63 | 63 | ||
64 | struct exynos_pm_data { | 64 | struct exynos_pm_data { |
65 | const struct exynos_wkup_irq *wkup_irq; | 65 | const struct exynos_wkup_irq *wkup_irq; |
66 | struct sleep_save *extra_save; | ||
67 | int num_extra_save; | ||
68 | unsigned int wake_disable_mask; | 66 | unsigned int wake_disable_mask; |
69 | unsigned int *release_ret_regs; | 67 | unsigned int *release_ret_regs; |
70 | 68 | ||
@@ -75,7 +73,7 @@ struct exynos_pm_data { | |||
75 | int (*cpu_suspend)(unsigned long); | 73 | int (*cpu_suspend)(unsigned long); |
76 | }; | 74 | }; |
77 | 75 | ||
78 | static struct exynos_pm_data *pm_data; | 76 | static const struct exynos_pm_data *pm_data; |
79 | 77 | ||
80 | static int exynos5420_cpu_state; | 78 | static int exynos5420_cpu_state; |
81 | static unsigned int exynos_pmu_spare3; | 79 | static unsigned int exynos_pmu_spare3; |
@@ -240,10 +238,6 @@ static void exynos_pm_prepare(void) | |||
240 | 238 | ||
241 | s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save)); | 239 | s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save)); |
242 | 240 | ||
243 | if (pm_data->extra_save) | ||
244 | s3c_pm_do_save(pm_data->extra_save, | ||
245 | pm_data->num_extra_save); | ||
246 | |||
247 | exynos_pm_enter_sleep_mode(); | 241 | exynos_pm_enter_sleep_mode(); |
248 | 242 | ||
249 | /* ensure at least INFORM0 has the resume address */ | 243 | /* ensure at least INFORM0 has the resume address */ |
@@ -366,10 +360,6 @@ static void exynos_pm_resume(void) | |||
366 | /* For release retention */ | 360 | /* For release retention */ |
367 | exynos_pm_release_retention(); | 361 | exynos_pm_release_retention(); |
368 | 362 | ||
369 | if (pm_data->extra_save) | ||
370 | s3c_pm_do_restore_core(pm_data->extra_save, | ||
371 | pm_data->num_extra_save); | ||
372 | |||
373 | s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save)); | 363 | s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save)); |
374 | 364 | ||
375 | if (cpuid == ARM_CPU_PART_CORTEX_A9) | 365 | if (cpuid == ARM_CPU_PART_CORTEX_A9) |
@@ -622,7 +612,7 @@ void __init exynos_pm_init(void) | |||
622 | pr_err("Failed to find PMU node\n"); | 612 | pr_err("Failed to find PMU node\n"); |
623 | return; | 613 | return; |
624 | } | 614 | } |
625 | pm_data = (struct exynos_pm_data *) match->data; | 615 | pm_data = (const struct exynos_pm_data *) match->data; |
626 | 616 | ||
627 | /* Platform-specific GIC callback */ | 617 | /* Platform-specific GIC callback */ |
628 | gic_arch_extn.irq_set_wake = exynos_irq_set_wake; | 618 | gic_arch_extn.irq_set_wake = exynos_irq_set_wake; |