rtc: wm831x: use .set_time
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 7 Apr 2019 11:54:44 +0000 (13:54 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 29 Apr 2019 13:53:01 +0000 (15:53 +0200)
Use .set_time instead of the deprecated .set_mmss.

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-wm831x.c

index 6a0defd1608822690661d6010e253b09923d3436..ed29f4df2a3c60209b4b2f2fd0d580d249531057 100644 (file)
@@ -165,15 +165,17 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm)
 /*
  * Set current time and date in RTC
  */
-static int wm831x_rtc_set_mmss(struct device *dev, unsigned long time)
+static int wm831x_rtc_settime(struct device *dev, struct rtc_time *tm)
 {
        struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev);
        struct wm831x *wm831x = wm831x_rtc->wm831x;
        struct rtc_time new_tm;
-       unsigned long new_time;
+       unsigned long time, new_time;
        int ret;
        int count = 0;
 
+       time = rtc_tm_to_time64(tm);
+
        ret = wm831x_reg_write(wm831x, WM831X_RTC_TIME_1,
                               (time >> 16) & 0xffff);
        if (ret < 0) {
@@ -334,7 +336,7 @@ static irqreturn_t wm831x_alm_irq(int irq, void *data)
 
 static const struct rtc_class_ops wm831x_rtc_ops = {
        .read_time = wm831x_rtc_readtime,
-       .set_mmss = wm831x_rtc_set_mmss,
+       .set_time = wm831x_rtc_settime,
        .read_alarm = wm831x_rtc_readalarm,
        .set_alarm = wm831x_rtc_setalarm,
        .alarm_irq_enable = wm831x_rtc_alarm_irq_enable,