rtc: pcap: switch to rtc_time64_to_tm/rtc_tm_to_time64
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 30 Apr 2019 09:33:00 +0000 (11:33 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Wed, 8 May 2019 20:14:36 +0000 (22:14 +0200)
Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.

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

index 97624085326001df2fff96f6930663af42643bca..be2678042fcc31f730ee0d42562b4836e5bd8866 100644 (file)
@@ -55,7 +55,7 @@ static int pcap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAYA, &days);
        secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY;
 
-       rtc_time_to_tm(secs, tm);
+       rtc_time64_to_tm(secs, tm);
 
        return 0;
 }
@@ -63,12 +63,9 @@ static int pcap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 static int pcap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct pcap_rtc *pcap_rtc = dev_get_drvdata(dev);
-       struct rtc_time *tm = &alrm->time;
-       unsigned long secs;
+       unsigned long secs = rtc_tm_to_time64(&alrm->time);
        u32 tod, days;
 
-       rtc_tm_to_time(tm, &secs);
-
        tod = secs % SEC_PER_DAY;
        ezx_pcap_write(pcap_rtc->pcap, PCAP_REG_RTC_TODA, tod);
 
@@ -90,7 +87,7 @@ static int pcap_rtc_read_time(struct device *dev, struct rtc_time *tm)
        ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAY, &days);
        secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY;
 
-       rtc_time_to_tm(secs, tm);
+       rtc_time64_to_tm(secs, tm);
 
        return 0;
 }