s390: 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>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 58bc6eb49de1da7ee1e3061a7ade5865f1c8d800..2ead7e78c4568ec7fe50ece74c3109d424efa852 100644 (file)
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -930,7 +930,7 @@ dasd_use_raw_store(struct device *dev, struct device_attribute *attr,
        if (IS_ERR(devmap))
                return PTR_ERR(devmap);
 
-       if ((strict_strtoul(buf, 10, &val) != 0) || val > 1)
+       if ((kstrtoul(buf, 10, &val) != 0) || val > 1)
                return -EINVAL;
 
        spin_lock(&dasd_devmap_lock);
@@ -1225,7 +1225,7 @@ dasd_expires_store(struct device *dev, struct device_attribute *attr,
        if (IS_ERR(device))
                return -ENODEV;
 
-       if ((strict_strtoul(buf, 10, &val) != 0) ||
+       if ((kstrtoul(buf, 10, &val) != 0) ||
            (val > DASD_EXPIRES_MAX) || val == 0) {
                dasd_put_device(device);
                return -EINVAL;
@@ -1265,7 +1265,7 @@ dasd_retries_store(struct device *dev, struct device_attribute *attr,
        if (IS_ERR(device))
                return -ENODEV;
 
-       if ((strict_strtoul(buf, 10, &val) != 0) ||
+       if ((kstrtoul(buf, 10, &val) != 0) ||
            (val > DASD_RETRIES_MAX)) {
                dasd_put_device(device);
                return -EINVAL;
@@ -1307,7 +1307,7 @@ dasd_timeout_store(struct device *dev, struct device_attribute *attr,
        if (IS_ERR(device) || !device->block)
                return -ENODEV;
 
-       if ((strict_strtoul(buf, 10, &val) != 0) ||
+       if ((kstrtoul(buf, 10, &val) != 0) ||
            val > UINT_MAX / HZ) {
                dasd_put_device(device);
                return -EINVAL;

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 84846c2b96d34bdf3f0f1461038d76c9627e2704..959135a01847940a5ecee33ae902b83cf8ecfe44 100644 (file)
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -137,7 +137,7 @@ static ssize_t ccwgroup_online_store(struct device *dev,
        if (!try_module_get(gdrv->driver.owner))
                return -EINVAL;
 
-       ret = strict_strtoul(buf, 0, &value);
+       ret = kstrtoul(buf, 0, &value);
        if (ret)
                goto out;
 

diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 4495e0627a40ad8168fe99c34d90c82adc960ee5..23054f8fa9fc2ef8735caed6bdf4d53dc557cf9e 100644 (file)
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -1182,7 +1182,7 @@ static ssize_t cmb_enable_store(struct device *dev,
        int ret;
        unsigned long val;
 
-       ret = strict_strtoul(buf, 16, &val);
+       ret = kstrtoul(buf, 16, &val);
        if (ret)
                return ret;
 

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 1ebe5d3ddebb28e7caddb0ec742bc76ce1307f78..4eb2a54e64f25c5f2e9221645e14a9d79d952b9b 100644 (file)
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -740,7 +740,7 @@ css_cm_enable_store(struct device *dev, struct device_attribute *attr,
        int ret;
        unsigned long val;
 
-       ret = strict_strtoul(buf, 16, &val);
+       ret = kstrtoul(buf, 16, &val);
        if (ret)
                return ret;
        mutex_lock(&css->mutex);

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 1ab5f6c36d9b4439db490797ca62aa239f04f7fa..e4a7ab2bb629f76358896e1389072c391fe3504c 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -564,7 +564,7 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
                ret = 0;
        } else {
                force = 0;
-               ret = strict_strtoul(buf, 16, &i);
+               ret = kstrtoul(buf, 16, &i);
        }
        if (ret)
                goto out;

diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index d1c8025b0b037605c73f331b6ebd3178feed2767..adef5f5de118a7ed9b320b3cea07672bc511ec36 100644 (file)
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -208,7 +208,7 @@ static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,
                goto out;
        }
 
-       rc = strict_strtoul(buf, 16, &i);
+       rc = kstrtoul(buf, 16, &i);
        if (rc) {
                rc = -EINVAL;
                goto out;