Commit 03745d1f authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: pcap: switch to rtc_time64_to_tm/rtc_tm_to_time64



Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d1403c48
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -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;
}