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

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>

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 1b9e4aee914b716fc787f942ea0bbe01f1bb83bf..8004b071a9f2e59f5cb9bbe90993ff7b108f973c 100644 (file)
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -104,11 +104,11 @@ static void __init zfcp_init_device_setup(char *devstr)
        strncpy(busid, token, ZFCP_BUS_ID_SIZE);
 
        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;
 
        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;
 
        kfree(str_saved);

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 3f01bbf0609f6fb854911da5d9c0261271b184be..091c4a42ee20d06604c6bae3b50683b53e25b850 100644 (file)
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -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);
        unsigned long val;
 
-       if (strict_strtoul(buf, 0, &val) || val != 0)
+       if (kstrtoul(buf, 0, &val) || val != 0)
                return -EINVAL;
 
        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;
        struct scsi_device *sdev;
 
-       if (strict_strtoul(buf, 0, &val) || val != 0)
+       if (kstrtoul(buf, 0, &val) || val != 0)
                return -EINVAL;
 
        sdev = zfcp_unit_sdev(unit);
@@ -184,7 +184,7 @@ static ssize_t zfcp_sysfs_adapter_failed_store(struct device *dev,
        if (!adapter)
                return -ENODEV;
 
-       if (strict_strtoul(buf, 0, &val) || val != 0) {
+       if (kstrtoul(buf, 0, &val) || val != 0) {
                retval = -EINVAL;
                goto out;
        }
@@ -236,7 +236,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,
        if (!adapter)
                return -ENODEV;
 
-       if (strict_strtoull(buf, 0, (unsigned long long *) &wwpn))
+       if (kstrtoull(buf, 0, (unsigned long long *) &wwpn))
                goto out;
 
        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;
        int retval;
 
-       if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))
+       if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))
                return -EINVAL;
 
        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);
        u64 fcp_lun;
 
-       if (strict_strtoull(buf, 0, (unsigned long long *) &fcp_lun))
+       if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))
                return -EINVAL;
 
        if (zfcp_unit_remove(port, fcp_lun))