ARM: pm: extract common code from MULTI_CPU/!MULTI_CPU paths

Very little code is different between these two paths now, so extract
the common code.

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, 6 insertions, 18 deletions

diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index f8e92513c1bd..0a778c30859b 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -19,29 +19,13 @@ ENTRY(cpu_suspend)
         mov     r9, lr
 #ifdef MULTI_CPU
         ldr     r10, =processor
-        mov     r2, sp                  @ current virtual SP
         ldr     r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state
         ldr     ip, [r10, #CPU_DO_RESUME] @ virtual resume function
-        sub     sp, sp, r0              @ allocate CPU state on stack
-        mov     r0, sp                  @ save pointer
-        add     ip, ip, r1              @ convert resume fn to phys
-        stmfd   sp!, {r1, r2, ip}       @ save v:p, virt SP, phys resume fn
-        ldr     r3, =sleep_save_sp
-        add     r2, sp, r1              @ convert SP to phys
-#ifdef CONFIG_SMP
-        ALT_SMP(mrc p15, 0, lr, c0, c0, 5)
-        ALT_UP(mov lr, #0)
-        and     lr, lr, #15
-        str     r2, [r3, lr, lsl #2]    @ save phys SP
 #else
-        str     r2, [r3]                @ save phys SP
-#endif
-        mov     lr, pc
-        ldr     pc, [r10, #CPU_DO_SUSPEND] @ save CPU state
-#else
-        mov     r2, sp                  @ current virtual SP
         ldr     r0, =cpu_suspend_size
         ldr     ip, =cpu_do_resume
+#endif
+        mov     r2, sp                  @ current virtual SP
         sub     sp, sp, r0              @ allocate CPU state on stack
         mov     r0, sp                  @ save pointer
         add     ip, ip, r1              @ convert resume fn to phys
@@ -56,6 +40,10 @@ ENTRY(cpu_suspend)
 #else
         str     r2, [r3]                @ save phys SP
 #endif
+#ifdef MULTI_CPU
+        mov     lr, pc
+        ldr     pc, [r10, #CPU_DO_SUSPEND] @ save CPU state
+#else
         bl      cpu_do_suspend
 #endif