diff options
| author | Daniel Walter | 2014-08-08 23:24:01 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-08-09 00:57:28 +0200 |
| commit | 1618bd53e6f43918f90ca04a4fcaf664b0a78749 (patch) | |
| tree | 1e120c2e094193d32b8d5e94118d4bf5dafb41b2 /arch/powerpc/kernel | |
| parent | arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto (diff) | |
| download | kernel-qcow2-linux-1618bd53e6f43918f90ca04a4fcaf664b0a78749.tar.gz kernel-qcow2-linux-1618bd53e6f43918f90ca04a4fcaf664b0a78749.tar.xz kernel-qcow2-linux-1618bd53e6f43918f90ca04a4fcaf664b0a78749.zip | |
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>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/kernel/vio.c | 2 |
2 files changed, 4 insertions, 4 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; |