Commit ca824be9 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: ds1374: switch to rtc_time64_to_tm/rtc_tm_to_time64

Call the 64bit versions of rtc_tm time conversion.

Link: https://lore.kernel.org/r/20200306073404.56921-3-alexandre.belloni@bootlin.comSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 4136ff3a
...@@ -164,7 +164,7 @@ static int ds1374_read_time(struct device *dev, struct rtc_time *time) ...@@ -164,7 +164,7 @@ static int ds1374_read_time(struct device *dev, struct rtc_time *time)
ret = ds1374_read_rtc(client, &itime, DS1374_REG_TOD0, 4); ret = ds1374_read_rtc(client, &itime, DS1374_REG_TOD0, 4);
if (!ret) if (!ret)
rtc_time_to_tm(itime, time); rtc_time64_to_tm(itime, time);
return ret; return ret;
} }
...@@ -172,9 +172,8 @@ static int ds1374_read_time(struct device *dev, struct rtc_time *time) ...@@ -172,9 +172,8 @@ static int ds1374_read_time(struct device *dev, struct rtc_time *time)
static int ds1374_set_time(struct device *dev, struct rtc_time *time) static int ds1374_set_time(struct device *dev, struct rtc_time *time)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
unsigned long itime; unsigned long itime = rtc_tm_to_time64(time);
rtc_tm_to_time(time, &itime);
return ds1374_write_rtc(client, itime, DS1374_REG_TOD0, 4); return ds1374_write_rtc(client, itime, DS1374_REG_TOD0, 4);
} }
...@@ -212,7 +211,7 @@ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -212,7 +211,7 @@ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
if (ret) if (ret)
goto out; goto out;
rtc_time_to_tm(now + cur_alarm, &alarm->time); rtc_time64_to_tm(now + cur_alarm, &alarm->time);
alarm->enabled = !!(cr & DS1374_REG_CR_WACE); alarm->enabled = !!(cr & DS1374_REG_CR_WACE);
alarm->pending = !!(sr & DS1374_REG_SR_AF); alarm->pending = !!(sr & DS1374_REG_SR_AF);
...@@ -237,8 +236,8 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -237,8 +236,8 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
if (ret < 0) if (ret < 0)
return ret; return ret;
rtc_tm_to_time(&alarm->time, &new_alarm); new_alarm = rtc_tm_to_time64(&alarm->time);
rtc_tm_to_time(&now, &itime); itime = rtc_tm_to_time64(&now);
/* This can happen due to races, in addition to dates that are /* This can happen due to races, in addition to dates that are
* truly in the past. To avoid requiring the caller to check for * truly in the past. To avoid requiring the caller to check for
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment