Commit 5dd12c29 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Greg Kroah-Hartman

staging: android-alarm: Don't use save_time_delta.

Remove references to non-existant save_time_delta.

Change-Id: Iaefeca497de02fe36b7f5d79075912f6e349ec53
CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
[Added commit message -jstultz]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 841cb11c
...@@ -373,8 +373,8 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -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) ...@@ -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)),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment