rtc: mpc5121: switch to rtc_time64_to_tm/rtc_tm_to_time64
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 6 Mar 2020 07:44:03 +0000 (08:44 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 16 Mar 2020 10:12:10 +0000 (11:12 +0100)
Call the 64bit versions of rtc_tm time conversion.

Link: https://lore.kernel.org/r/20200306074404.58909-4-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-mpc5121.c

index 5507f1847f7c8c3a5af5df51f10a06e3f27faeea..3040844129cee7ce17202d58c4fa9e4352bc50ca 100644 (file)
@@ -111,7 +111,7 @@ static int mpc5121_rtc_read_time(struct device *dev, struct rtc_time *tm)
         */
        now = in_be32(&regs->actual_time) + in_be32(&regs->target_time);
 
-       rtc_time_to_tm(now, tm);
+       rtc_time64_to_tm(now, tm);
 
        /*
         * update second minute hour registers
@@ -126,16 +126,14 @@ static int mpc5121_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct mpc5121_rtc_data *rtc = dev_get_drvdata(dev);
        struct mpc5121_rtc_regs __iomem *regs = rtc->regs;
-       int ret;
        unsigned long now;
 
        /*
         * The actual_time register is read only so we write the offset
         * between it and linux time to the target_time register.
         */
-       ret = rtc_tm_to_time(tm, &now);
-       if (ret == 0)
-               out_be32(&regs->target_time, now - in_be32(&regs->actual_time));
+       now = rtc_tm_to_time64(tm);
+       out_be32(&regs->target_time, now - in_be32(&regs->actual_time));
 
        /*
         * update second minute hour registers