diff options
author | Daniel Walter <sahne@0x90.at> | 2012-10-22 19:20:35 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-14 18:37:08 -0500 |
commit | 883ee4f79d636d13f24c2479c66d42cb652b0239 (patch) | |
tree | 4fb2bf51ac968f6ee1118d3cb4da4ece79a6fafb /kernel | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) |
PM / sysfs: replace strict_str* with kstrto*
Replace strict_strtoul() with kstrtoul() in pm_async_store() and
pm_qos_power_write().
[rjw: Modified subject and changelog.]
Signed-off-by: Daniel Walter <sahne@0x90.at>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/main.c | 2 | ||||
-rw-r--r-- | kernel/power/qos.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index f458238109cc..1c16f9167de1 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -59,7 +59,7 @@ static ssize_t pm_async_store(struct kobject *kobj, struct kobj_attribute *attr, | |||
59 | { | 59 | { |
60 | unsigned long val; | 60 | unsigned long val; |
61 | 61 | ||
62 | if (strict_strtoul(buf, 10, &val)) | 62 | if (kstrtoul(buf, 10, &val)) |
63 | return -EINVAL; | 63 | return -EINVAL; |
64 | 64 | ||
65 | if (val > 1) | 65 | if (val > 1) |
diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 846bd42c7ed1..4da05cee81bf 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c | |||
@@ -500,7 +500,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, | |||
500 | } else { | 500 | } else { |
501 | ascii_value[count] = '\0'; | 501 | ascii_value[count] = '\0'; |
502 | } | 502 | } |
503 | ret = strict_strtoul(ascii_value, 16, &ulval); | 503 | ret = kstrtoul(ascii_value, 16, &ulval); |
504 | if (ret) { | 504 | if (ret) { |
505 | pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret); | 505 | pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret); |
506 | return -EINVAL; | 506 | return -EINVAL; |