diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-21 21:18:15 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-22 06:20:00 -0400 |
commit | 0178722be9ed575d1724f6b815b7a1eb74b1ccb7 (patch) | |
tree | ed0f4c0cf95576fab29ee049bbd6120804def067 /drivers | |
parent | fd3930f70c8d14008f3377d51ce039806dfc542e (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/block/dasd_devmap.c | 8 | ||||
-rw-r--r-- | drivers/s390/cio/ccwgroup.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/cmf.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/css.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/device.c | 2 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l3_sys.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index 58bc6eb49de1..2ead7e78c456 100644 --- 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, | |||
930 | if (IS_ERR(devmap)) | 930 | if (IS_ERR(devmap)) |
931 | return PTR_ERR(devmap); | 931 | return PTR_ERR(devmap); |
932 | 932 | ||
933 | if ((strict_strtoul(buf, 10, &val) != 0) || val > 1) | 933 | if ((kstrtoul(buf, 10, &val) != 0) || val > 1) |
934 | return -EINVAL; | 934 | return -EINVAL; |
935 | 935 | ||
936 | spin_lock(&dasd_devmap_lock); | 936 | spin_lock(&dasd_devmap_lock); |
@@ -1225,7 +1225,7 @@ dasd_expires_store(struct device *dev, struct device_attribute *attr, | |||
1225 | if (IS_ERR(device)) | 1225 | if (IS_ERR(device)) |
1226 | return -ENODEV; | 1226 | return -ENODEV; |
1227 | 1227 | ||
1228 | if ((strict_strtoul(buf, 10, &val) != 0) || | 1228 | if ((kstrtoul(buf, 10, &val) != 0) || |
1229 | (val > DASD_EXPIRES_MAX) || val == 0) { | 1229 | (val > DASD_EXPIRES_MAX) || val == 0) { |
1230 | dasd_put_device(device); | 1230 | dasd_put_device(device); |
1231 | return -EINVAL; | 1231 | return -EINVAL; |
@@ -1265,7 +1265,7 @@ dasd_retries_store(struct device *dev, struct device_attribute *attr, | |||
1265 | if (IS_ERR(device)) | 1265 | if (IS_ERR(device)) |
1266 | return -ENODEV; | 1266 | return -ENODEV; |
1267 | 1267 | ||
1268 | if ((strict_strtoul(buf, 10, &val) != 0) || | 1268 | if ((kstrtoul(buf, 10, &val) != 0) || |
1269 | (val > DASD_RETRIES_MAX)) { | 1269 | (val > DASD_RETRIES_MAX)) { |
1270 | dasd_put_device(device); | 1270 | dasd_put_device(device); |
1271 | return -EINVAL; | 1271 | return -EINVAL; |
@@ -1307,7 +1307,7 @@ dasd_timeout_store(struct device *dev, struct device_attribute *attr, | |||
1307 | if (IS_ERR(device) || !device->block) | 1307 | if (IS_ERR(device) || !device->block) |
1308 | return -ENODEV; | 1308 | return -ENODEV; |
1309 | 1309 | ||
1310 | if ((strict_strtoul(buf, 10, &val) != 0) || | 1310 | if ((kstrtoul(buf, 10, &val) != 0) || |
1311 | val > UINT_MAX / HZ) { | 1311 | val > UINT_MAX / HZ) { |
1312 | dasd_put_device(device); | 1312 | dasd_put_device(device); |
1313 | return -EINVAL; | 1313 | return -EINVAL; |
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index 84846c2b96d3..959135a01847 100644 --- 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, | |||
137 | if (!try_module_get(gdrv->driver.owner)) | 137 | if (!try_module_get(gdrv->driver.owner)) |
138 | return -EINVAL; | 138 | return -EINVAL; |
139 | 139 | ||
140 | ret = strict_strtoul(buf, 0, &value); | 140 | ret = kstrtoul(buf, 0, &value); |
141 | if (ret) | 141 | if (ret) |
142 | goto out; | 142 | goto out; |
143 | 143 | ||
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index 4495e0627a40..23054f8fa9fc 100644 --- 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, | |||
1182 | int ret; | 1182 | int ret; |
1183 | unsigned long val; | 1183 | unsigned long val; |
1184 | 1184 | ||
1185 | ret = strict_strtoul(buf, 16, &val); | 1185 | ret = kstrtoul(buf, 16, &val); |
1186 | if (ret) | 1186 | if (ret) |
1187 | return ret; | 1187 | return ret; |
1188 | 1188 | ||
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 1ebe5d3ddebb..4eb2a54e64f2 100644 --- 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, | |||
740 | int ret; | 740 | int ret; |
741 | unsigned long val; | 741 | unsigned long val; |
742 | 742 | ||
743 | ret = strict_strtoul(buf, 16, &val); | 743 | ret = kstrtoul(buf, 16, &val); |
744 | if (ret) | 744 | if (ret) |
745 | return ret; | 745 | return ret; |
746 | mutex_lock(&css->mutex); | 746 | mutex_lock(&css->mutex); |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 1ab5f6c36d9b..e4a7ab2bb629 100644 --- 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, | |||
564 | ret = 0; | 564 | ret = 0; |
565 | } else { | 565 | } else { |
566 | force = 0; | 566 | force = 0; |
567 | ret = strict_strtoul(buf, 16, &i); | 567 | ret = kstrtoul(buf, 16, &i); |
568 | } | 568 | } |
569 | if (ret) | 569 | if (ret) |
570 | goto out; | 570 | goto out; |
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index d1c8025b0b03..adef5f5de118 100644 --- 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, | |||
208 | goto out; | 208 | goto out; |
209 | } | 209 | } |
210 | 210 | ||
211 | rc = strict_strtoul(buf, 16, &i); | 211 | rc = kstrtoul(buf, 16, &i); |
212 | if (rc) { | 212 | if (rc) { |
213 | rc = -EINVAL; | 213 | rc = -EINVAL; |
214 | goto out; | 214 | goto out; |