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 <benjamin.gaign...@linaro.org>
CC: Alessandro Zummo <a.zu...@towertech.it>
CC: Alexandre Belloni <alexandre.bell...@free-electrons.com>
CC: rtc-linux@googlegroups.com
CC: linux-ker...@vger.kernel.org
---
 drivers/rtc/rtc-ds1305.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 72b2293..b41168b 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -324,23 +324,20 @@ static int ds1305_set_alarm(struct device *dev, struct 
rtc_wkalrm *alm)
 {
        struct ds1305   *ds1305 = dev_get_drvdata(dev);
        struct spi_device *spi = ds1305->spi;
-       unsigned long   now, later;
+       unsigned long long now, later;
        struct rtc_time tm;
        int             status;
        u8              buf[1 + DS1305_ALM_LEN];
 
        /* convert desired alarm to time_t */
-       status = rtc_tm_to_time(&alm->time, &later);
-       if (status < 0)
-               return status;
+       later = rtc_tm_to_time64(&alm->time);
 
        /* Read current time as time_t */
        status = ds1305_get_time(dev, &tm);
        if (status < 0)
                return status;
-       status = rtc_tm_to_time(&tm, &now);
-       if (status < 0)
-               return status;
+
+       now = rtc_tm_to_time64(&tm);
 
        /* make sure alarm fires within the next 24 hours */
        if (later <= now)
-- 
1.9.1

-- 
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
--- 
You received this message because you are subscribed to the Google Groups 
"rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to rtc-linux+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to