diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-21 14:29:26 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-24 03:48:44 -0400 |
commit | e7089da9567fa8da37e35e1f81a5e3579d0d582d (patch) | |
tree | de492cf95d9b4643c52a85d2174fc22bf9a31609 /arch/arm/plat-samsung/pm.c | |
parent | 4d01446fea61a32b6755ae1e11314ffca744dcaa (diff) |
ARM: pm: samsung: move cpu_suspend into C code
Move the call to cpu_suspend into C code, and noticing that all the
s3c_cpu_save implementations are now identical, we can move this
into the common samsung code.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-samsung/pm.c')
-rw-r--r-- | arch/arm/plat-samsung/pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 3828191416b5..3a6d0768ba0c 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c | |||
@@ -231,7 +231,7 @@ static void __maybe_unused s3c_pm_show_resume_irqs(int start, | |||
231 | 231 | ||
232 | 232 | ||
233 | void (*pm_cpu_prep)(void); | 233 | void (*pm_cpu_prep)(void); |
234 | void (*pm_cpu_sleep)(void); | 234 | void (*pm_cpu_sleep)(unsigned long); |
235 | 235 | ||
236 | #define any_allowed(mask, allow) (((mask) & (allow)) != (allow)) | 236 | #define any_allowed(mask, allow) (((mask) & (allow)) != (allow)) |
237 | 237 | ||
@@ -294,11 +294,11 @@ static int s3c_pm_enter(suspend_state_t state) | |||
294 | 294 | ||
295 | s3c_pm_arch_stop_clocks(); | 295 | s3c_pm_arch_stop_clocks(); |
296 | 296 | ||
297 | /* s3c_cpu_save will also act as our return point from when | 297 | /* this will also act as our return point from when |
298 | * we resume as it saves its own register state and restores it | 298 | * we resume as it saves its own register state and restores it |
299 | * during the resume. */ | 299 | * during the resume. */ |
300 | 300 | ||
301 | s3c_cpu_save(0, PLAT_PHYS_OFFSET - PAGE_OFFSET); | 301 | cpu_suspend(0, PHYS_OFFSET - PAGE_OFFSET, 0, pm_cpu_sleep); |
302 | 302 | ||
303 | /* restore the system state */ | 303 | /* restore the system state */ |
304 | 304 | ||