浏览代码

[ARM] pxa: stop doing our own rtc management over suspend

Remove the RTC management over a suspend/resume cycle.  Firstly,
we may not be using the internal RTC for time keeping; some
platforms have an external RTC for this inspite of the PXA having
an internal RTC.  Secondly, the RTC library code handles updating
system time on resume.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 18 年之前
父节点
当前提交
2aca0a8657
共有 1 个文件被更改,包括 0 次插入10 次删除
  1. 0 10
      arch/arm/mach-pxa/pm.c

+ 0 - 10
arch/arm/mach-pxa/pm.c

@@ -77,7 +77,6 @@ int pxa_pm_enter(suspend_state_t state)
 {
 {
 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
 	unsigned long checksum = 0;
 	unsigned long checksum = 0;
-	struct timespec delta, rtc;
 	int i;
 	int i;
 	extern void pxa_cpu_pm_enter(suspend_state_t state);
 	extern void pxa_cpu_pm_enter(suspend_state_t state);
 
 
@@ -87,11 +86,6 @@ int pxa_pm_enter(suspend_state_t state)
 		iwmmxt_task_disable(NULL);
 		iwmmxt_task_disable(NULL);
 #endif
 #endif
 
 
-	/* preserve current time */
-	rtc.tv_sec = RCNR;
-	rtc.tv_nsec = 0;
-	save_time_delta(&delta, &rtc);
-
 	SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2);
 	SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2);
 	SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2);
 	SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2);
 	SAVE(GRER0); SAVE(GRER1); SAVE(GRER2);
 	SAVE(GRER0); SAVE(GRER1); SAVE(GRER2);
@@ -183,10 +177,6 @@ int pxa_pm_enter(suspend_state_t state)
 
 
 	RESTORE(PSTR);
 	RESTORE(PSTR);
 
 
-	/* restore current time */
-	rtc.tv_sec = RCNR;
-	restore_time_delta(&delta, &rtc);
-
 #ifdef DEBUG
 #ifdef DEBUG
 	printk(KERN_DEBUG "*** made it back from resume\n");
 	printk(KERN_DEBUG "*** made it back from resume\n");
 #endif
 #endif