aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-samsung/pm.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-21 19:29:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-24 08:48:44 +0100
commite7089da9567fa8da37e35e1f81a5e3579d0d582d (patch)
treede492cf95d9b4643c52a85d2174fc22bf9a31609 /arch/arm/plat-samsung/pm.c
parent4d01446fea61a32b6755ae1e11314ffca744dcaa (diff)
downloadlinux-linaro-stable-e7089da9567fa8da37e35e1f81a5e3579d0d582d.tar.gz
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.c6
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,
void (*pm_cpu_prep)(void);
-void (*pm_cpu_sleep)(void);
+void (*pm_cpu_sleep)(unsigned long);
#define any_allowed(mask, allow) (((mask) & (allow)) != (allow))
@@ -294,11 +294,11 @@ static int s3c_pm_enter(suspend_state_t state)
s3c_pm_arch_stop_clocks();
- /* s3c_cpu_save will also act as our return point from when
+ /* this will also act as our return point from when
* we resume as it saves its own register state and restores it
* during the resume. */
- s3c_cpu_save(0, PLAT_PHYS_OFFSET - PAGE_OFFSET);
+ cpu_suspend(0, PHYS_OFFSET - PAGE_OFFSET, 0, pm_cpu_sleep);
/* restore the system state */