瀏覽代碼

drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul()

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

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jingoo Han 12 年之前
父節點
當前提交
4c5591c1ee
共有 1 個文件被更改,包括 10 次插入5 次删除
  1. 10 5
      drivers/rtc/rtc-pcf2123.c

+ 10 - 5
drivers/rtc/rtc-pcf2123.c

@@ -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);
 	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;
 	txbuf[0] = PCF2123_READ | reg;
 	ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
 	ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
@@ -117,9 +118,13 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
 
 
 	r = container_of(attr, struct pcf2123_sysfs_reg, 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);
+	if (ret)
+		return ret;
+
+	ret = kstrtoul(buffer, 10, &val);
+	if (ret)
+		return ret;
 
 
 	txbuf[0] = PCF2123_WRITE | reg;
 	txbuf[0] = PCF2123_WRITE | reg;
 	txbuf[1] = val;
 	txbuf[1] = val;