drivers/scsi: replace strict_strto calls

Replace obsolete strict_strto with more appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 017f8b9554e53de6c64ae49f73d79e348a97dfd9..6f3275d020a044abd3607e9ca6b4f114dd45200f 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4213,9 +4213,9 @@ static ssize_t pmcraid_store_log_level(
 {
        struct Scsi_Host *shost;
        struct pmcraid_instance *pinstance;
-       unsigned long val;
+       u8 val;
 
-       if (strict_strtoul(buf, 10, &val))
+       if (kstrtou8(buf, 10, &val))
                return -EINVAL;
        /* log-level should be from 0 to 2 */
        if (val > 2)

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 406b3038bbad919e560fc3eebcd64caa1fe55a8c..8b4105a22ac2564b5dc64eef5c816c5df0eaf3a8 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -910,9 +910,9 @@ sdev_store_queue_ramp_up_period(struct device *dev,
                                const char *buf, size_t count)
 {
        struct scsi_device *sdev = to_scsi_device(dev);
-       unsigned long period;
+       unsigned int period;
 
-       if (strict_strtoul(buf, 10, &period))
+       if (kstrtouint(buf, 10, &period))
                return -EINVAL;
 
        sdev->queue_ramp_up_period = msecs_to_jiffies(period);