diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-26 00:10:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-26 21:02:43 -0400 |
commit | 34da5e6770ac06df770a0355b417155e6e84e263 (patch) | |
tree | 0b415e6c7e5c5a96ac730ed3b36488a662129e92 /drivers/base | |
parent | 86df268705696ce2286410f1493e294e889bdce6 (diff) |
driver core: replace strict_strto*() with kstrto*()
The usage of strict_strto*() is not preferred, because
strict_strto*() is obsolete. Thus, kstrto*() should be
used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 2 | ||||
-rw-r--r-- | drivers/base/memory.c | 4 | ||||
-rw-r--r-- | drivers/base/power/sysfs.c | 2 | ||||
-rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 4b9b0d7f6022..e51c78782933 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -38,7 +38,7 @@ long sysfs_deprecated = 0; | |||
38 | #endif | 38 | #endif |
39 | static __init int sysfs_deprecated_setup(char *arg) | 39 | static __init int sysfs_deprecated_setup(char *arg) |
40 | { | 40 | { |
41 | return strict_strtol(arg, 10, &sysfs_deprecated); | 41 | return kstrtol(arg, 10, &sysfs_deprecated); |
42 | } | 42 | } |
43 | early_param("sysfs.deprecated", sysfs_deprecated_setup); | 43 | early_param("sysfs.deprecated", sysfs_deprecated_setup); |
44 | #endif | 44 | #endif |
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 2b7813ec6d02..ddd14ce6654c 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
@@ -469,7 +469,7 @@ store_soft_offline_page(struct device *dev, | |||
469 | u64 pfn; | 469 | u64 pfn; |
470 | if (!capable(CAP_SYS_ADMIN)) | 470 | if (!capable(CAP_SYS_ADMIN)) |
471 | return -EPERM; | 471 | return -EPERM; |
472 | if (strict_strtoull(buf, 0, &pfn) < 0) | 472 | if (kstrtoull(buf, 0, &pfn) < 0) |
473 | return -EINVAL; | 473 | return -EINVAL; |
474 | pfn >>= PAGE_SHIFT; | 474 | pfn >>= PAGE_SHIFT; |
475 | if (!pfn_valid(pfn)) | 475 | if (!pfn_valid(pfn)) |
@@ -488,7 +488,7 @@ store_hard_offline_page(struct device *dev, | |||
488 | u64 pfn; | 488 | u64 pfn; |
489 | if (!capable(CAP_SYS_ADMIN)) | 489 | if (!capable(CAP_SYS_ADMIN)) |
490 | return -EPERM; | 490 | return -EPERM; |
491 | if (strict_strtoull(buf, 0, &pfn) < 0) | 491 | if (kstrtoull(buf, 0, &pfn) < 0) |
492 | return -EINVAL; | 492 | return -EINVAL; |
493 | pfn >>= PAGE_SHIFT; | 493 | pfn >>= PAGE_SHIFT; |
494 | ret = memory_failure(pfn, 0, 0); | 494 | ret = memory_failure(pfn, 0, 0); |
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c index a53ebd265701..03e089ade5ce 100644 --- a/drivers/base/power/sysfs.c +++ b/drivers/base/power/sysfs.c | |||
@@ -206,7 +206,7 @@ static ssize_t autosuspend_delay_ms_store(struct device *dev, | |||
206 | if (!dev->power.use_autosuspend) | 206 | if (!dev->power.use_autosuspend) |
207 | return -EIO; | 207 | return -EIO; |
208 | 208 | ||
209 | if (strict_strtol(buf, 10, &delay) != 0 || delay != (int) delay) | 209 | if (kstrtol(buf, 10, &delay) != 0 || delay != (int) delay) |
210 | return -EINVAL; | 210 | return -EINVAL; |
211 | 211 | ||
212 | device_lock(dev); | 212 | device_lock(dev); |
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 53495753fbdb..634164da9c15 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c | |||
@@ -281,7 +281,7 @@ static ssize_t regmap_map_write_file(struct file *file, | |||
281 | reg = simple_strtoul(start, &start, 16); | 281 | reg = simple_strtoul(start, &start, 16); |
282 | while (*start == ' ') | 282 | while (*start == ' ') |
283 | start++; | 283 | start++; |
284 | if (strict_strtoul(start, 16, &value)) | 284 | if (kstrtoul(start, 16, &value)) |
285 | return -EINVAL; | 285 | return -EINVAL; |
286 | 286 | ||
287 | /* Userspace has been fiddling around behind the kernel's back */ | 287 | /* Userspace has been fiddling around behind the kernel's back */ |