On Thu, Apr 18, 2019 at 12:00 PM Alexandre Belloni <[email protected]> wrote: > > Call the 64bit versions of rtc_tm time conversion now that the range is > enforced by the core. > > Signed-off-by: Alexandre Belloni <[email protected]> > --- > drivers/rtc/rtc-jz4740.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c > index 079469627bd7..15b6832f3931 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) > if (timeout == 0) > return -EIO; > > - rtc_time_to_tm(secs, time); > + rtc_time64_to_tm(secs, time); > > return 0; > } > @@ -196,7 +196,7 @@ static int jz4740_rtc_read_alarm(struct device *dev, > struct rtc_wkalrm *alrm) > alrm->enabled = !!(ctrl & JZ_RTC_CTRL_AE); > alrm->pending = !!(ctrl & JZ_RTC_CTRL_AF); > > - rtc_time_to_tm(secs, &alrm->time); > + rtc_time64_to_tm(secs, &alrm->time); > > return rtc_valid_tm(&alrm->time); > } > @@ -205,9 +205,7 @@ static int jz4740_rtc_set_alarm(struct device *dev, > struct rtc_wkalrm *alrm) > { > int ret; > struct jz4740_rtc *rtc = dev_get_drvdata(dev); > - unsigned long secs; > - > - rtc_tm_to_time(&alrm->time, &secs); > + unsigned long secs = rtc_tm_to_time64(&alrm->time);
nitpick: all other declarations are done with uint32_t, so to make it clear (maybe) with something like: uint32_t secs = lower_32_bits(rtc_tm_to_time64(&alrm->time)); Technically I would have stored the full time64_t here and put a WARN_ON(secs > U32_MAX) but I am not sure what other driver are supposed to do in this case. > > ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC_ALARM, secs); > if (!ret) > -- > 2.20.1 >
