aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDaniel Walter <dwalter@google.com>2014-08-08 17:23:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:27 -0400
commit4fce45b44bdbf293bc1aed5526e4da90f32eb8eb (patch)
tree0d973e6c570ef7e2d36b295842cf08f7a3a90430 /arch/arm
parent056610ac140ea4775d8855989c4316017ed3bd0a (diff)
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>
Diffstat (limited to 'arch/arm')
-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 43596e0ed051..d897292712eb 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)
90 if (!arg) 90 if (!arg)
91 return 0; 91 return 0;
92 92
93 return strict_strtoul(arg, 0, &balloon3_features_present); 93 return kstrtoul(arg, 0, &balloon3_features_present);
94} 94}
95early_param("balloon3_features", parse_balloon3_features); 95early_param("balloon3_features", parse_balloon3_features);
96 96
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 41f27f667ca8..de3b08073fe7 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -769,7 +769,7 @@ static unsigned long viper_tpm;
769 769
770static int __init viper_tpm_setup(char *str) 770static int __init viper_tpm_setup(char *str)
771{ 771{
772 return strict_strtoul(str, 10, &viper_tpm) >= 0; 772 return kstrtoul(str, 10, &viper_tpm) >= 0;
773} 773}
774 774
775__setup("tpm=", viper_tpm_setup); 775__setup("tpm=", viper_tpm_setup);