aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Walter <dwalter@google.com>2014-08-08 17:24:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:28 -0400
commitf7c65af5136f7999121f05a8398dd34a43bad139 (patch)
treea117bb6a8d1cb8a1cf363b35dfbf529f18bfec89
parent164109e3cdba52b9f2ece063bc3aa2a90f77c273 (diff)
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>
-rw-r--r--drivers/scsi/pmcraid.c4
-rw-r--r--drivers/scsi/scsi_sysfs.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 017f8b9554e5..6f3275d020a0 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4213,9 +4213,9 @@ static ssize_t pmcraid_store_log_level(
4213{ 4213{
4214 struct Scsi_Host *shost; 4214 struct Scsi_Host *shost;
4215 struct pmcraid_instance *pinstance; 4215 struct pmcraid_instance *pinstance;
4216 unsigned long val; 4216 u8 val;
4217 4217
4218 if (strict_strtoul(buf, 10, &val)) 4218 if (kstrtou8(buf, 10, &val))
4219 return -EINVAL; 4219 return -EINVAL;
4220 /* log-level should be from 0 to 2 */ 4220 /* log-level should be from 0 to 2 */
4221 if (val > 2) 4221 if (val > 2)
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 406b3038bbad..8b4105a22ac2 100644
--- 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,
910 const char *buf, size_t count) 910 const char *buf, size_t count)
911{ 911{
912 struct scsi_device *sdev = to_scsi_device(dev); 912 struct scsi_device *sdev = to_scsi_device(dev);
913 unsigned long period; 913 unsigned int period;
914 914
915 if (strict_strtoul(buf, 10, &period)) 915 if (kstrtouint(buf, 10, &period))
916 return -EINVAL; 916 return -EINVAL;
917 917
918 sdev->queue_ramp_up_period = msecs_to_jiffies(period); 918 sdev->queue_ramp_up_period = msecs_to_jiffies(period);