Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SCSI] zfcp: cleanup use of obsolete strict_strto* functions

Browse Source 
strict_strtoul and friends are obsolete. Use kstrtoul functions
instead.

Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com>
Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Martin Peschke 2013-08-22 17:49:32 +02:00 committed by James Bottomley
parent 75a1408d32
commit ee732ea829
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/scsi/zfcp_aux.c
View File

@ -104,11 +104,11 @@ static void __init zfcp_init_device_setup(char *devstr)
strncpy(busid, token, ZFCP_BUS_ID_SIZE); strncpy(busid, token, ZFCP_BUS_ID_SIZE);
token = strsep(&str, ","); token = strsep(&str, ",");
if (!token || strict_strtoull(token, 0, (unsigned long long *) &wwpn)) if (!token || kstrtoull(token, 0, (unsigned long long *) &wwpn))
goto err_out; goto err_out;
token = strsep(&str, ","); token = strsep(&str, ",");
if (!token || strict_strtoull(token, 0, (unsigned long long *) &lun)) if (!token || kstrtoull(token, 0, (unsigned long long *) &lun))
goto err_out; goto err_out;
kfree(str_saved); kfree(str_saved);

12
drivers/s390/scsi/zfcp_sysfs.c
View File

@ -95,7 +95,7 @@ static ssize_t zfcp_sysfs_port_failed_store(struct device *dev,
struct zfcp_port *port = container_of(dev, struct zfcp_port, dev); struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);
unsigned long val; unsigned long val;
if (strict_strtoul(buf, 0, &val) || val != 0) if (kstrtoul(buf, 0, &val) || val != 0)
return -EINVAL; return -EINVAL;
zfcp_erp_set_port_status(port, ZFCP_STATUS_COMMON_RUNNING); zfcp_erp_set_port_status(port, ZFCP_STATUS_COMMON_RUNNING);
@ -134,7 +134,7 @@ static ssize_t zfcp_sysfs_unit_failed_store(struct device *dev,
unsigned long val; unsigned long val;
struct scsi_device *sdev; struct scsi_device *sdev;
if (strict_strtoul(buf, 0, &val) || val != 0) if (kstrtoul(buf, 0, &val) || val != 0)
return -EINVAL; return -EINVAL;
sdev = zfcp_unit_sdev(unit); sdev = zfcp_unit_sdev(unit);
@ -184,7 +184,7 @@ static ssize_t zfcp_sysfs_adapter_failed_store(struct device *dev,
if (!adapter) if (!adapter)
return -ENODEV; return -ENODEV;
if (strict_strtoul(buf, 0, &val) || val != 0) { if (kstrtoul(buf, 0, &val) || val != 0) {
retval = -EINVAL; retval = -EINVAL;
goto out; goto out;
} }
@ -236,7 +236,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
if (!adapter) if (!adapter)
return -ENODEV; return -ENODEV;
if (strict_strtoull(buf, 0, (unsigned long long *) &wwpn)) if (kstrtoull(buf, 0, (unsigned long long *) &wwpn))
goto out; goto out;
port = zfcp_get_port_by_wwpn(adapter, wwpn); port = zfcp_get_port_by_wwpn(adapter, wwpn);
@ -297,7 +297,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
u64 fcp_lun; u64 fcp_lun;
int retval; int retval;
if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun)) if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))
return -EINVAL; return -EINVAL;
retval = zfcp_unit_add(port, fcp_lun); retval = zfcp_unit_add(port, fcp_lun);
@ -315,7 +315,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
struct zfcp_port *port = container_of(dev, struct zfcp_port, dev); struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);
u64 fcp_lun; u64 fcp_lun;
if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun)) if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))
return -EINVAL; return -EINVAL;
if (zfcp_unit_remove(port, fcp_lun)) if (zfcp_unit_remove(port, fcp_lun))