Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0178722b authored by Jingoo Han's avatar Jingoo Han Committed by Martin Schwidefsky
Browse files

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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent fd3930f7

drivers/s390/block/dasd_devmap.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -930,7 +930,7 @@ dasd_use_raw_store(struct device *dev, struct device_attribute *attr, 
	if (IS_ERR(devmap))

	if (IS_ERR(devmap))

		return PTR_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;

		return -EINVAL;





	spin_lock(&dasd_devmap_lock);

	spin_lock(&dasd_devmap_lock);
@@ -1225,7 +1225,7 @@ dasd_expires_store(struct device *dev, struct device_attribute *attr, 
	if (IS_ERR(device))

	if (IS_ERR(device))

		return -ENODEV;

		return -ENODEV;





	if ((strict_strtoul(buf, 10, &val) != 0) ||

	if ((kstrtoul(buf, 10, &val) != 0) ||

	    (val > DASD_EXPIRES_MAX) || val == 0) {

	    (val > DASD_EXPIRES_MAX) || val == 0) {

		dasd_put_device(device);

		dasd_put_device(device);

		return -EINVAL;

		return -EINVAL;
@@ -1265,7 +1265,7 @@ dasd_retries_store(struct device *dev, struct device_attribute *attr, 
	if (IS_ERR(device))

	if (IS_ERR(device))

		return -ENODEV;

		return -ENODEV;





	if ((strict_strtoul(buf, 10, &val) != 0) ||

	if ((kstrtoul(buf, 10, &val) != 0) ||

	    (val > DASD_RETRIES_MAX)) {

	    (val > DASD_RETRIES_MAX)) {

		dasd_put_device(device);

		dasd_put_device(device);

		return -EINVAL;

		return -EINVAL;
@@ -1307,7 +1307,7 @@ dasd_timeout_store(struct device *dev, struct device_attribute *attr, 
	if (IS_ERR(device) || !device->block)

	if (IS_ERR(device) || !device->block)

		return -ENODEV;

		return -ENODEV;





	if ((strict_strtoul(buf, 10, &val) != 0) ||

	if ((kstrtoul(buf, 10, &val) != 0) ||

	    val > UINT_MAX / HZ) {

	    val > UINT_MAX / HZ) {

		dasd_put_device(device);

		dasd_put_device(device);

		return -EINVAL;

		return -EINVAL;

drivers/s390/cio/ccwgroup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,7 @@ static ssize_t ccwgroup_online_store(struct device *dev, 
	if (!try_module_get(gdrv->driver.owner))

	if (!try_module_get(gdrv->driver.owner))

		return -EINVAL;

		return -EINVAL;





	ret = strict_strtoul(buf, 0, &value);

	ret = kstrtoul(buf, 0, &value);

	if (ret)

	if (ret)

		goto out;

		goto out;

drivers/s390/cio/cmf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1182,7 +1182,7 @@ static ssize_t cmb_enable_store(struct device *dev, 
	int ret;

	int ret;

	unsigned long val;

	unsigned long val;





	ret = strict_strtoul(buf, 16, &val);

	ret = kstrtoul(buf, 16, &val);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/s390/cio/css.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -740,7 +740,7 @@ css_cm_enable_store(struct device *dev, struct device_attribute *attr, 
	int ret;

	int ret;

	unsigned long val;

	unsigned long val;





	ret = strict_strtoul(buf, 16, &val);

	ret = kstrtoul(buf, 16, &val);

	if (ret)

	if (ret)

		return ret;

		return ret;

	mutex_lock(&css->mutex);

	mutex_lock(&css->mutex);

drivers/s390/cio/device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -564,7 +564,7 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr, 
		ret = 0;

		ret = 0;

	} else {

	} else {

		force = 0;

		force = 0;

		ret = strict_strtoul(buf, 16, &i);

		ret = kstrtoul(buf, 16, &i);

	}

	}

	if (ret)

	if (ret)

		goto out;

		goto out;