Skip to contentSkip to conversation

rtc: rtc-pcf2123: replace strict_strtoul() with kstrtoul()

PATCH Superseded Jingoo Han 2 participants 2 messages Jun 3, 2013 Real time clock (RTC)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 1/1 rtc: rtc-pcf2123: replace strict_strtoul() with kstrtoul()

The usage of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used.

---
Changes since v1:
- Used return code from kstrtoul().

 drivers/rtc/rtc-pcf2123.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/rtc/rtc-pcf2123.c +6 -5
index b2a78a0..a887d95 100644
@@ -94,8 +94,9 @@ static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
 
 	r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-	if (strict_strtoul(r->name, 16, &reg))
-		return -EINVAL;
+	ret = kstrtoul(r->name, 16, &reg);
+	if (ret)
+		return ret;
 
 	txbuf[0] = PCF2123_READ | reg;
 	ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
@@ -117,9 +118,9 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
 
 	r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-	if (strict_strtoul(r->name, 16, &reg)
-		|| strict_strtoul(buffer, 10, &val))
-		return -EINVAL;
+	ret = kstrtoul(r->name, 16, &reg) || kstrtoul(buffer, 10, &val);
+	if (ret)
+		return ret;
 
 	txbuf[0] = PCF2123_WRITE | reg;
 	txbuf[1] = val;
Signature · 1 line
1.7.10.4
Reviewed-by on v2 1/1
#1 lore raw
Quoted 3 lines · Jingoo Han

The usage of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used.

There is an issue, after fixing it take my

drivers/rtc/rtc-pcf2123.c static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr, · line 121

Quoted 12 lines
drivers/rtc/rtc-pcf2123.c +1 -3
@@ -117,9 +118,9 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
 
        r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-       if (strict_strtoul(r->name, 16, &reg)
-               || strict_strtoul(buffer, 10, &val))
-               return -EINVAL;
+       ret = kstrtoul(r->name, 16, &reg) || kstrtoul(buffer, 10, &val);

This is not correct. Please, split to two sequential checks.

drivers/rtc/rtc-pcf2123.c static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr, · line 123

Quoted 2 lines
drivers/rtc/rtc-pcf2123.c +2 -0
+       if (ret)
+               return ret;

--
With Best Regards,
Andy Shevchenko