]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rtc: test: use .set_time
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 7 Apr 2019 21:30:12 +0000 (23:30 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 8 Apr 2019 07:58:45 +0000 (09:58 +0200)
Use .set_time instead of the deprecated .set_mmss64.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-test.c

index f1a6dc5ad01376b5765fe4ba887f27a561e7f670..b298e9902f45bedb218581a264798a8440f93bab 100644 (file)
@@ -70,11 +70,11 @@ static int test_rtc_read_time(struct device *dev, struct rtc_time *tm)
        return 0;
 }
 
-static int test_rtc_set_mmss64(struct device *dev, time64_t secs)
+static int test_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct rtc_test_data *rtd = dev_get_drvdata(dev);
 
-       rtd->offset = secs - ktime_get_real_seconds();
+       rtd->offset = rtc_tm_to_time64(tm) - ktime_get_real_seconds();
 
        return 0;
 }
@@ -94,15 +94,15 @@ static int test_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)
 
 static const struct rtc_class_ops test_rtc_ops_noalm = {
        .read_time = test_rtc_read_time,
-       .set_mmss64 = test_rtc_set_mmss64,
+       .set_time = test_rtc_set_time,
        .alarm_irq_enable = test_rtc_alarm_irq_enable,
 };
 
 static const struct rtc_class_ops test_rtc_ops = {
        .read_time = test_rtc_read_time,
+       .set_time = test_rtc_set_time,
        .read_alarm = test_rtc_read_alarm,
        .set_alarm = test_rtc_set_alarm,
-       .set_mmss64 = test_rtc_set_mmss64,
        .alarm_irq_enable = test_rtc_alarm_irq_enable,
 };