]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul()
authorJingoo Han <jg1.han@samsung.com>
Wed, 3 Jul 2013 22:07:58 +0000 (15:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 23:08:00 +0000 (16:08 -0700)
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>
drivers/rtc/rtc-pcf2123.c

index b2a78a02cf1652ec63c675f74a3684c3b5b1b9c7..1725b5090e33d1ea8a768c07f65302f0b61831d7 100644 (file)
@@ -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,13 @@ 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);
+       if (ret)
+               return ret;
+
+       ret = kstrtoul(buffer, 10, &val);
+       if (ret)
+               return ret;
 
        txbuf[0] = PCF2123_WRITE | reg;
        txbuf[1] = val;