drivers/w1/w1.c: replace strict_strtol() with kstrtol()

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

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 22013ca2119c..c7c64f18773d 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -234,9 +234,11 @@ static ssize_t w1_master_attribute_store_search(struct device * dev,
 {
         long tmp;
         struct w1_master *md = dev_to_w1_master(dev);
+        int ret;
 
-        if (strict_strtol(buf, 0, &tmp) == -EINVAL)
-                return -EINVAL;
+        ret = kstrtol(buf, 0, &tmp);
+        if (ret)
+                return ret;
 
         mutex_lock(&md->mutex);
         md->search_count = tmp;
@@ -266,9 +268,11 @@ static ssize_t w1_master_attribute_store_pullup(struct device *dev,
 {
         long tmp;
         struct w1_master *md = dev_to_w1_master(dev);
+        int ret;
 
-        if (strict_strtol(buf, 0, &tmp) == -EINVAL)
-                return -EINVAL;
+        ret = kstrtol(buf, 0, &tmp);
+        if (ret)
+                return ret;
 
         mutex_lock(&md->mutex);
         md->enable_pullup = tmp;