summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Walter <dwalter@google.com>2014-08-08 14:23:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 15:57:27 -0700
commit4fce45b44bdbf293bc1aed5526e4da90f32eb8eb (patch)
tree0d973e6c570ef7e2d36b295842cf08f7a3a90430
parent056610ac140ea4775d8855989c4316017ed3bd0a (diff)
downloadop-kernel-dev-4fce45b44bdbf293bc1aed5526e4da90f32eb8eb.zip
op-kernel-dev-4fce45b44bdbf293bc1aed5526e4da90f32eb8eb.tar.gz
arch/arm/mach-pxa: replace strict_strto call with kstrto
Replace obsolete call to strict_strto with kstrto Signed-off-by: Daniel Walter <dwalter@google.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm/mach-pxa/balloon3.c2
-rw-r--r--arch/arm/mach-pxa/viper.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 43596e0..d897292 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -90,7 +90,7 @@ int __init parse_balloon3_features(char *arg)
if (!arg)
return 0;
- return strict_strtoul(arg, 0, &balloon3_features_present);
+ return kstrtoul(arg, 0, &balloon3_features_present);
}
early_param("balloon3_features", parse_balloon3_features);
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 41f27f6..de3b080 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -769,7 +769,7 @@ static unsigned long viper_tpm;
static int __init viper_tpm_setup(char *str)
{
- return strict_strtoul(str, 10, &viper_tpm) >= 0;
+ return kstrtoul(str, 10, &viper_tpm) >= 0;
}
__setup("tpm=", viper_tpm_setup);
OpenPOWER on IntegriCloud