hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/dasd: Replace simple_strtoul with kstrtouint 

simple_strtoul() has been marked obsolete for quite some time now.
Replace a few last occurrences with kstrtouint().

Reviewed-by: Stefan Haberland <sth@linux.vnet.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Jan Höppner 2016-10-10 18:29:48 +02:00 committed by Martin Schwidefsky
parent 8139d8526c
commit ce7a788f4d
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/s390/block/dasd_devmap.c
View File

@ -726,15 +726,13 @@ static ssize_t dasd_ff_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int val; unsigned int val;
char *endp;
devmap = dasd_devmap_from_cdev(to_ccwdev(dev)); devmap = dasd_devmap_from_cdev(to_ccwdev(dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
val = simple_strtoul(buf, &endp, 0); if (kstrtouint(buf, 0, &val) || val > 1)
if (((endp + 1) < (buf + count)) || (val > 1))
return -EINVAL; return -EINVAL;
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
@ -773,15 +771,13 @@ dasd_ro_store(struct device *dev, struct device_attribute *attr,
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
struct dasd_device *device; struct dasd_device *device;
int val; unsigned int val;
char *endp;
devmap = dasd_devmap_from_cdev(to_ccwdev(dev)); devmap = dasd_devmap_from_cdev(to_ccwdev(dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
val = simple_strtoul(buf, &endp, 0); if (kstrtouint(buf, 0, &val) || val > 1)
if (((endp + 1) < (buf + count)) || (val > 1))
return -EINVAL; return -EINVAL;
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
@ -824,15 +820,13 @@ dasd_erplog_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int val; unsigned int val;
char *endp;
devmap = dasd_devmap_from_cdev(to_ccwdev(dev)); devmap = dasd_devmap_from_cdev(to_ccwdev(dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
val = simple_strtoul(buf, &endp, 0); if (kstrtouint(buf, 0, &val) || val > 1)
if (((endp + 1) < (buf + count)) || (val > 1))
return -EINVAL; return -EINVAL;
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
@ -871,16 +865,14 @@ dasd_use_diag_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
unsigned int val;
ssize_t rc; ssize_t rc;
int val;
char *endp;
devmap = dasd_devmap_from_cdev(to_ccwdev(dev)); devmap = dasd_devmap_from_cdev(to_ccwdev(dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
val = simple_strtoul(buf, &endp, 0); if (kstrtouint(buf, 0, &val) || val > 1)
if (((endp + 1) < (buf + count)) || (val > 1))
return -EINVAL; return -EINVAL;
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
@ -1198,8 +1190,8 @@ dasd_eer_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int val, rc; unsigned int val;
char *endp; int rc;
devmap = dasd_devmap_from_cdev(to_ccwdev(dev)); devmap = dasd_devmap_from_cdev(to_ccwdev(dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
@ -1207,8 +1199,7 @@ dasd_eer_store(struct device *dev, struct device_attribute *attr,
if (!devmap->device) if (!devmap->device)
return -ENODEV; return -ENODEV;
val = simple_strtoul(buf, &endp, 0); if (kstrtouint(buf, 0, &val) || val > 1)
if (((endp + 1) < (buf + count)) || (val > 1))
return -EINVAL; return -EINVAL;
if (val) { if (val) {