diff options
Diffstat (limited to 'drivers/rtc/class.c')
-rw-r--r-- | drivers/rtc/class.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index d37588f08055..0fca4d74c76b 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
@@ -68,7 +68,7 @@ static int rtc_suspend(struct device *dev) | |||
68 | return 0; | 68 | return 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | getnstimeofday64(&old_system); | 71 | ktime_get_real_ts64(&old_system); |
72 | old_rtc.tv_sec = rtc_tm_to_time64(&tm); | 72 | old_rtc.tv_sec = rtc_tm_to_time64(&tm); |
73 | 73 | ||
74 | 74 | ||
@@ -110,7 +110,7 @@ static int rtc_resume(struct device *dev) | |||
110 | return 0; | 110 | return 0; |
111 | 111 | ||
112 | /* snapshot the current rtc and system time at resume */ | 112 | /* snapshot the current rtc and system time at resume */ |
113 | getnstimeofday64(&new_system); | 113 | ktime_get_real_ts64(&new_system); |
114 | err = rtc_read_time(rtc, &tm); | 114 | err = rtc_read_time(rtc, &tm); |
115 | if (err < 0) { | 115 | if (err < 0) { |
116 | pr_debug("%s: fail to read rtc time\n", dev_name(&rtc->dev)); | 116 | pr_debug("%s: fail to read rtc time\n", dev_name(&rtc->dev)); |
@@ -172,7 +172,6 @@ static struct rtc_device *rtc_allocate_device(void) | |||
172 | 172 | ||
173 | mutex_init(&rtc->ops_lock); | 173 | mutex_init(&rtc->ops_lock); |
174 | spin_lock_init(&rtc->irq_lock); | 174 | spin_lock_init(&rtc->irq_lock); |
175 | spin_lock_init(&rtc->irq_task_lock); | ||
176 | init_waitqueue_head(&rtc->irq_queue); | 175 | init_waitqueue_head(&rtc->irq_queue); |
177 | 176 | ||
178 | /* Init timerqueue */ | 177 | /* Init timerqueue */ |