X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2Fmach-sa1100%2Fpm.c;h=379ea5e3950f7de6794ef990a91ef89f58352e3c;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=7120ec5aa726c897187b5138596dbeb4d6e63425;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 7120ec5aa..379ea5e39 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -45,9 +45,6 @@ extern void sa1100_cpu_resume(void);
  */
 enum {	SLEEP_SAVE_SP = 0,
 
-	SLEEP_SAVE_OIER,
-	SLEEP_SAVE_OSMR0, SLEEP_SAVE_OSMR1, SLEEP_SAVE_OSMR2, SLEEP_SAVE_OSMR3,
-
 	SLEEP_SAVE_GPDR, SLEEP_SAVE_GAFR,
 	SLEEP_SAVE_PPDR, SLEEP_SAVE_PPSR, SLEEP_SAVE_PPAR, SLEEP_SAVE_PSDR,
 
@@ -57,7 +54,7 @@ enum {	SLEEP_SAVE_SP = 0,
 };
 
 
-static int sa11x0_pm_enter(u32 state)
+static int sa11x0_pm_enter(suspend_state_t state)
 {
 	unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
 	struct timespec delta, rtc;
@@ -72,12 +69,6 @@ static int sa11x0_pm_enter(u32 state)
 	gpio = GPLR;
 
 	/* save vital registers */
-	SAVE(OSMR0);
-	SAVE(OSMR1);
-	SAVE(OSMR2);
-	SAVE(OSMR3);
-	SAVE(OIER);
-
 	SAVE(GPDR);
 	SAVE(GAFR);
 
@@ -129,15 +120,6 @@ static int sa11x0_pm_enter(u32 state)
 	 */
 	PSSR = PSSR_PH;
 
-	RESTORE(OSMR0);
-	RESTORE(OSMR1);
-	RESTORE(OSMR2);
-	RESTORE(OSMR3);
-	RESTORE(OIER);
-
-	/* OSMR0 is the system timer: make sure OSCR is sufficiently behind */
-	OSCR = OSMR0 - LATCH;
-
 	/* restore current time */
 	rtc.tv_sec = RCNR;
 	restore_time_delta(&delta, &rtc);
@@ -153,7 +135,7 @@ unsigned long sleep_phys_sp(void *sp)
 /*
  * Called after processes are frozen, but before we shut down devices.
  */
-static int sa11x0_pm_prepare(u32 state)
+static int sa11x0_pm_prepare(suspend_state_t state)
 {
 	return 0;
 }
@@ -161,7 +143,7 @@ static int sa11x0_pm_prepare(u32 state)
 /*
  * Called after devices are re-setup, but before processes are thawed.
  */
-static int sa11x0_pm_finish(u32 state)
+static int sa11x0_pm_finish(suspend_state_t state)
 {
 	return 0;
 }