ARM: pm: convert cpu_suspend() to a normal function

cpu_suspend() has a weird calling method which makes it only possible to
call from assembly code: it returns with a modified stack pointer to
finish the suspend, but on resume, it 'returns' via a provided pointer.

We can make cpu_suspend() appear to be a normal function merely by
swapping the resume pointer argument and the link register.

Do so, and update all callers to take account of this more traditional
behaviour.

Acked-by: Frank Hofmann <frank.hofmann@tomtom.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 7 deletions

diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S
index fd7032f84ae7..f822e6282dd4 100644
--- a/arch/arm/plat-s3c24xx/sleep.S
+++ b/arch/arm/plat-s3c24xx/sleep.S
@@ -49,21 +49,17 @@
 
 ENTRY(s3c_cpu_save)
         stmfd   sp!, { r4 - r12, lr }
-        ldr     r3, =resume_with_mmu
+        adr     r3, BSYM(s3c24xx_finish_suspend)
         bl      cpu_suspend
+        ldmfd   sp!, { r4 - r12, pc }
 
+s3c24xx_finish_suspend:
         @@ jump to final code to send system to sleep
         ldr     r0, =pm_cpu_sleep
         @@ldr   pc, [ r0 ]
         ldr     r0, [ r0 ]
         mov     pc, r0
         
-        @@ return to the caller, after having the MMU
-        @@ turned on, this restores the last bits from the
-        @@ stack
-resume_with_mmu:
-        ldmfd   sp!, { r4 - r12, pc }
-
         .ltorg
 
         /* sleep magic, to allow the bootloader to check for an valid