rtc_time_to_tm() and rtc_tm_to_time() are deprecated because they
rely on 32bits variables and that will make rtc break in y2038/2016.
Stop using those two functions to safer 64bits ones.

Signed-off-by: Benjamin Gaignard <[email protected]>
Acked-by: Pavel Machek <[email protected]>
CC: "Rafael J. Wysocki" <[email protected]>
CC: Pavel Machek <[email protected]>
CC: Len Brown <[email protected]>
CC: Alessandro Zummo <[email protected]>
CC: Alexandre Belloni <[email protected]>
CC: [email protected]
CC: [email protected]
CC: [email protected]
---
 kernel/power/suspend_test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 5db2170..334a893 100644
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -71,7 +71,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, 
suspend_state_t state)
        static char info_test[] __initdata =
                KERN_INFO "PM: test RTC wakeup from '%s' suspend\n";
 
-       unsigned long           now;
+       unsigned long long              now;
        struct rtc_wkalrm       alm;
        int                     status;
 
@@ -82,10 +82,10 @@ static void __init test_wakealarm(struct rtc_device *rtc, 
suspend_state_t state)
                printk(err_readtime, dev_name(&rtc->dev), status);
                return;
        }
-       rtc_tm_to_time(&alm.time, &now);
+       now = rtc_tm_to_time64(&alm.time);
 
        memset(&alm, 0, sizeof alm);
-       rtc_time_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time);
+       rtc_time64_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time);
        alm.enabled = true;
 
        status = rtc_set_alarm(rtc, &alm);
-- 
1.9.1

Reply via email to