diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-21 11:29:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-24 03:48:45 -0400 |
commit | a9503d2185bbc28e498c435a07f24986c48b5cbe (patch) | |
tree | 86987b72ceccea710fa67085f51c6083a9fc672e /arch/arm/mach-pxa/pxa25x.c | |
parent | 372c0ac8aca7655b6a8920b10bf9563402ac19d8 (diff) |
ARM: pm: pxa: move cpu_suspend into C code
We don't need a veneer for cpu_suspend, it can be called directly from
C code now. Move it into the PXA CPU suspend functions, along with
the accumulator register saving/restoring.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index fed363cec9c6..fd7725cb5c01 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -244,7 +244,8 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state) | |||
244 | 244 | ||
245 | switch (state) { | 245 | switch (state) { |
246 | case PM_SUSPEND_MEM: | 246 | case PM_SUSPEND_MEM: |
247 | pxa25x_cpu_suspend(PWRMODE_SLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); | 247 | cpu_suspend(0, PHYS_OFFSET - PAGE_OFFSET, PWRMODE_SLEEP, |
248 | pxa25x_finish_suspend); | ||
248 | break; | 249 | break; |
249 | } | 250 | } |
250 | } | 251 | } |