summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@bootlin.com>2019-04-30 05:28:16 -0400
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2019-04-30 05:50:13 -0400
commitbe8dce96f3f5b680ffffa915b0d906298b6fec7a (patch)
tree106da035f0398d590af80384fe50ebcb0e2d2a5b
parenta7ab6bed284f1fe70d847e93276ff2979122f555 (diff)
rtc: jz4740: 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. Tested-by: Mathieu Malaterre <malat@debian.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--drivers/rtc/rtc-jz4740.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c
index 079469627bd7..428376639870 100644
--- a/drivers/rtc/rtc-jz4740.c
+++ b/drivers/rtc/rtc-jz4740.c
@@ -171,7 +171,7 @@ static int jz4740_rtc_read_time(struct device *dev, struct rtc_time *time)
171 if (timeout == 0) 171 if (timeout == 0)
172 return -EIO; 172 return -EIO;
173 173
174 rtc_time_to_tm(secs, time); 174 rtc_time64_to_tm(secs, time);
175 175
176 return 0; 176 return 0;
177} 177}
@@ -196,7 +196,7 @@ static int jz4740_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
196 alrm->enabled = !!(ctrl & JZ_RTC_CTRL_AE); 196 alrm->enabled = !!(ctrl & JZ_RTC_CTRL_AE);
197 alrm->pending = !!(ctrl & JZ_RTC_CTRL_AF); 197 alrm->pending = !!(ctrl & JZ_RTC_CTRL_AF);
198 198
199 rtc_time_to_tm(secs, &alrm->time); 199 rtc_time64_to_tm(secs, &alrm->time);
200 200
201 return rtc_valid_tm(&alrm->time); 201 return rtc_valid_tm(&alrm->time);
202} 202}
@@ -205,9 +205,7 @@ static int jz4740_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
205{ 205{
206 int ret; 206 int ret;
207 struct jz4740_rtc *rtc = dev_get_drvdata(dev); 207 struct jz4740_rtc *rtc = dev_get_drvdata(dev);
208 unsigned long secs; 208 uint32_t secs = lower_32_bits(rtc_tm_to_time64(&alrm->time));
209
210 rtc_tm_to_time(&alrm->time, &secs);
211 209
212 ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC_ALARM, secs); 210 ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC_ALARM, secs);
213 if (!ret) 211 if (!ret)