arch/powerpc: replace obsolete strict_strto* calls

Replace strict_strto calls with more appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 7 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index d0225572faa1..75d62d63fe68 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -149,13 +149,13 @@ static void check_smt_enabled(void)
                 else if (!strcmp(smt_enabled_cmdline, "off"))
                         smt_enabled_at_boot = 0;
                 else {
-                        long smt;
+                        int smt;
                         int rc;
 
-                        rc = strict_strtol(smt_enabled_cmdline, 10, &smt);
+                        rc = kstrtoint(smt_enabled_cmdline, 10, &smt);
                         if (!rc)
                                 smt_enabled_at_boot =
-                                        min(threads_per_core, (int)smt);
+                                        min(threads_per_core, smt);
                 }
         } else {
                 dn = of_find_node_by_path("/options");
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 904c66128fae..5bfdab9047be 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -977,7 +977,7 @@ static ssize_t viodev_cmo_desired_set(struct device *dev,
         size_t new_desired;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &new_desired);
+        ret = kstrtoul(buf, 10, &new_desired);
         if (ret)
                 return ret;
 
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 2d0b4d68a40a..a2450b8a50a5 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -400,10 +400,10 @@ out:
 static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
 {
         struct device_node *dn, *parent;
-        unsigned long drc_index;
+        u32 drc_index;
         int rc;
 
-        rc = strict_strtoul(buf, 0, &drc_index);
+        rc = kstrtou32(buf, 0, &drc_index);
         if (rc)
                 return -EINVAL;
 
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index d146fef038b8..e7cb6d4a871a 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -320,7 +320,7 @@ static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
         u64 streamid;
         int rc;
 
-        rc = strict_strtoull(buf, 0, &streamid);
+        rc = kstrtou64(buf, 0, &streamid);
         if (rc)
                 return rc;