Merge branches 'pm-epoll', 'pnp' and 'powercap'

[karo-tx-linux.git] / drivers / s390 / scsi / zfcp_aux.c

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);