Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fce45b4 authored by Daniel Walter's avatar Daniel Walter Committed by Linus Torvalds
Browse files

arch/arm/mach-pxa: replace strict_strto call with kstrto 



Replace obsolete call to strict_strto with kstrto

Signed-off-by: default avatarDaniel Walter <dwalter@google.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 056610ac

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ int __init parse_balloon3_features(char *arg) 
	if (!arg)

	if (!arg)

		return 0;

		return 0;





	return strict_strtoul(arg, 0, &balloon3_features_present);

	return kstrtoul(arg, 0, &balloon3_features_present);

}

}

early_param("balloon3_features", parse_balloon3_features);

early_param("balloon3_features", parse_balloon3_features);

arch/arm/mach-pxa/viper.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -769,7 +769,7 @@ static unsigned long viper_tpm; 




static int __init viper_tpm_setup(char *str)

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);

__setup("tpm=", viper_tpm_setup);