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>

diff --git a/kernel/power/main.c b/kernel/power/main.c
index f458238109ccd32d195c39b02f1d0cc6efdc09c0..1c16f9167de15c4151be06ad54be69a7ed8faeb6 100644 (file)
--- 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 846bd42c7ed179673846817da8bb2e69078ce673..4da05cee81bfe1a6eb1c9aa90a1ab35fe98f7f3a 100644 (file)
--- 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;