rtc: r9701: remove leftover comment
Alexandre Belloni
maintainerPATCH 1/6 rtc: r9701: remove leftover comment
Commit 22652ba72453 ("rtc: stop validating rtc_time in .read_time") removed the code but not the associated comment.
--- drivers/rtc/rtc-r9701.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/rtc/rtc-r9701.c +0 -4
@@ -85,10 +85,6 @@ static int r9701_get_datetime(struct device *dev, struct rtc_time *dt) dt->tm_mon =bcd2bin (buf[4 ]) -1 ;/* RMONCNT */ dt->tm_year =bcd2bin (buf[5 ]) +100 ;/* RYRCNT */ -/* the rtc device may contain illegal values on power up -* according to the data sheet. make sure they are valid. -*/ -return 0 ; }
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 2/6 rtc: r9701: stop setting a default time
It doesn't make sense to set the RTC to a default value at probe time. Let the core handle invalid date and time.
--- drivers/rtc/rtc-r9701.c | 22 ---------------------- 1 file changed, 22 deletions(-)
drivers/rtc/rtc-r9701.c +0 -22
@@ -115,7 +115,6 @@ static const struct rtc_class_ops r9701_rtc_ops = {static int r9701_probe (struct spi_device *spi) {struct rtc_device *rtc; -struct rtc_time dt;unsigned char tmp;int res;
@@ -126,27 +125,6 @@ static int r9701_probe(struct spi_device *spi)return -ENODEV ; } -/* -* The device seems to be present. Now check if the registers -* contain invalid values. If so, try to write a default date: -* 2000/1/1 00:00:00 -*/ -if (r9701_get_datetime (&spi->dev, &dt)) { -dev_info (&spi->dev,"trying to repair invalid date/time\n" ); - dt.tm_sec =0 ; - dt.tm_min =0 ; - dt.tm_hour =0 ; - dt.tm_mday =1 ; - dt.tm_mon =0 ; - dt.tm_year =100 ; - -if (r9701_set_datetime (&spi->dev, &dt) || -r9701_get_datetime (&spi->dev, &dt)) { -dev_err (&spi->dev,"cannot repair RTC register\n" ); -return -ENODEV ; - } - } - rtc =devm_rtc_device_register (&spi->dev,"r9701" , &r9701_rtc_ops,THIS_MODULE );if (IS_ERR (rtc))
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 3/6 rtc: r9701: remove useless memset
In reply to Alexandre BelloniThe RTC core already sets to zero the struct rtc_tie it passes to the driver, avoid doing it a second time.
--- drivers/rtc/rtc-r9701.c | 2 -- 1 file changed, 2 deletions(-)
drivers/rtc/rtc-r9701.c +0 -2
@@ -75,8 +75,6 @@ static int r9701_get_datetime(struct device *dev, struct rtc_time *dt)if (ret)return ret; -memset (dt,0 ,sizeof (*dt)); - dt->tm_sec =bcd2bin (buf[0 ]);/* RSECCNT */ dt->tm_min =bcd2bin (buf[1 ]);/* RMINCNT */ dt->tm_hour =bcd2bin (buf[2 ]);/* RHRCNT */
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 4/6 rtc: r9701: stop setting RWKCNT
In reply to Alexandre Bellonitm_wday is never checked for validity and it is not read back in r9701_get_datetime. Avoid setting it to stop tripping static checkers:
drivers/rtc/rtc-r9701.c:109 r9701_set_datetime()
error: undefined (user controlled) shift '1 << dt->tm_wday'---
Cc: Dan Carpenter <[email protected]>
drivers/rtc/rtc-r9701.c | 1 - 1 file changed, 1 deletion(-)
drivers/rtc/rtc-r9701.c +0 -1
@@ -100,7 +100,6 @@ static int r9701_set_datetime(struct device *dev, struct rtc_time *dt) ret = ret ? ret :write_reg (dev,RDAYCNT ,bin2bcd (dt->tm_mday)); ret = ret ? ret :write_reg (dev,RMONCNT ,bin2bcd (dt->tm_mon +1 )); ret = ret ? ret :write_reg (dev,RYRCNT ,bin2bcd (dt->tm_year -100 )); - ret = ret ? ret :write_reg (dev,RWKCNT ,1 << dt->tm_wday);return ret; }
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 5/6 rtc: r9701: convert to devm_rtc_allocate_device
In reply to Alexandre BelloniThis allows further improvement of the driver.
--- drivers/rtc/rtc-r9701.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/rtc/rtc-r9701.c +3 -3
@@ -122,14 +122,14 @@ static int r9701_probe(struct spi_device *spi)return -ENODEV ; } - rtc =devm_rtc_device_register (&spi->dev,"r9701" , - &r9701_rtc_ops,THIS_MODULE ); + rtc =devm_rtc_allocate_device (&spi->dev);if (IS_ERR (rtc))return PTR_ERR (rtc);spi_set_drvdata (spi, rtc); + rtc->ops = &r9701_rtc_ops; -return 0 ; +return rtc_register_device (rtc); }static struct spi_driver r9701_driver = {
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 6/6 rtc: r9701: set range
In reply to Alexandre BelloniSet range and remove the set_time check. This is a classic BCD RTC.
--- drivers/rtc/rtc-r9701.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/rtc/rtc-r9701.c +3 -5
@@ -88,11 +88,7 @@ static int r9701_get_datetime(struct device *dev, struct rtc_time *dt)static int r9701_set_datetime (struct device *dev,struct rtc_time *dt) { -int ret, year; - - year = dt->tm_year +1900 ; -if (year >=2100 || year <2000 ) -return -EINVAL ; +int ret; ret =write_reg (dev,RHRCNT ,bin2bcd (dt->tm_hour)); ret = ret ? ret :write_reg (dev,RMINCNT ,bin2bcd (dt->tm_min));
@@ -128,6 +124,8 @@ static int r9701_probe(struct spi_device *spi)spi_set_drvdata (spi, rtc); rtc->ops = &r9701_rtc_ops; + rtc->range_min =RTC_TIMESTAMP_BEGIN_2000 ; + rtc->range_max =RTC_TIMESTAMP_END_2099 ;return rtc_register_device (rtc); }
Signature · 1 line
2.26.2