]> err.no Git - linux-2.6/commitdiff
[ARM] sa1100: stop doing our own rtc management over suspend
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 12 Jul 2007 20:29:06 +0000 (21:29 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 12 Jul 2007 20:29:06 +0000 (21:29 +0100)
Remove the RTC management over a suspend/resume cycle.  As per the
corresponding PXA patch, the RTC library code handles updating
system time on resume.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/pm.c

index d674cf3431567c88bdf5181ef99a7ab17c04fb36..01a37d3c0727de0c631dcbcd5e9c5378433c2946 100644 (file)
@@ -57,12 +57,7 @@ enum {       SLEEP_SAVE_SP = 0,
 static int sa11x0_pm_enter(suspend_state_t state)
 {
        unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
-       struct timespec delta, rtc;
 
-       /* preserve current time */
-       rtc.tv_sec = RCNR;
-       rtc.tv_nsec = 0;
-       save_time_delta(&delta, &rtc);
        gpio = GPLR;
 
        /* save vital registers */
@@ -119,10 +114,6 @@ static int sa11x0_pm_enter(suspend_state_t state)
         */
        PSSR = PSSR_PH;
 
-       /* restore current time */
-       rtc.tv_sec = RCNR;
-       restore_time_delta(&delta, &rtc);
-
        return 0;
 }