DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: alarm: Don't use save_time_delta.

Browse Source 
Change-Id: Iaefeca497de02fe36b7f5d79075912f6e349ec53
Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
Arve Hjønnevåg
2010-03-12 20:05:32 -08:00
committed by Colin Cross
parent 76cca8597f
commit b2a4ab2aa0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/alarm.c
View File

@@ -373,8 +373,8 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
struct rtc_time rtc_current_rtc_time; struct rtc_time rtc_current_rtc_time;
unsigned long rtc_current_time; unsigned long rtc_current_time;
unsigned long rtc_alarm_time; unsigned long rtc_alarm_time;
struct timespec rtc_current_timespec;
struct timespec rtc_delta; struct timespec rtc_delta;
struct timespec wall_time;
struct alarm_queue *wakeup_queue = NULL; struct alarm_queue *wakeup_queue = NULL;
struct alarm_queue *tmp_queue = NULL; struct alarm_queue *tmp_queue = NULL;
@@ -398,10 +398,11 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
wakeup_queue = tmp_queue; wakeup_queue = tmp_queue;
if (wakeup_queue) { if (wakeup_queue) {
rtc_read_time(alarm_rtc_dev, &rtc_current_rtc_time); rtc_read_time(alarm_rtc_dev, &rtc_current_rtc_time);
rtc_current_timespec.tv_nsec = 0; getnstimeofday(&wall_time);
rtc_tm_to_time(&rtc_current_rtc_time, rtc_tm_to_time(&rtc_current_rtc_time, &rtc_current_time);
&rtc_current_timespec.tv_sec); set_normalized_timespec(&rtc_delta,
save_time_delta(&rtc_delta, &rtc_current_timespec); wall_time.tv_sec - rtc_current_time,
wall_time.tv_nsec);
rtc_alarm_time = timespec_sub(ktime_to_timespec( rtc_alarm_time = timespec_sub(ktime_to_timespec(
hrtimer_get_expires(&wakeup_queue->timer)), hrtimer_get_expires(&wakeup_queue->timer)),