summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorDaniel Walter <sahne@0x90.at>2012-10-23 01:20:35 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-15 00:37:08 +0100
commit883ee4f79d636d13f24c2479c66d42cb652b0239 (patch)
tree4fb2bf51ac968f6ee1118d3cb4da4ece79a6fafb /kernel/power
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
downloadop-kernel-dev-883ee4f79d636d13f24c2479c66d42cb652b0239.zip
op-kernel-dev-883ee4f79d636d13f24c2479c66d42cb652b0239.tar.gz
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/power')
-rw-r--r--kernel/power/main.c2
-rw-r--r--kernel/power/qos.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index f458238..1c16f91 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,
{
unsigned long val;
- if (strict_strtoul(buf, 10, &val))
+ if (kstrtoul(buf, 10, &val))
return -EINVAL;
if (val > 1)
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 846bd42..4da05ce 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,
} else {
ascii_value[count] = '\0';
}
- ret = strict_strtoul(ascii_value, 16, &ulval);
+ ret = kstrtoul(ascii_value, 16, &ulval);
if (ret) {
pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
return -EINVAL;
OpenPOWER on IntegriCloud