aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-05-09 14:32:25 -0400
committerJohn Stultz <john.stultz@linaro.org>2014-05-12 13:09:25 -0400
commitcdafb93feb3d0ae3131f631a10f70954c96cbef8 (patch)
tree2af5609063eaeb9201f7c3bab2abc07ccf090e8b
parentc04ae71c9c264312a6f57d2665a79f7bbccf8758 (diff)
ntp: Convert simple_strtol to kstrtol
Replace obsolete function simple_strtol w/ kstrtol Inspired-By: Andrew Morton <akpm@linux-foundation.org> Cc: John Stultz <john.stultz@linaro.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> [jstultz: Tweak commit message] Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--kernel/time/ntp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 419a52cecd20..82b7c9edba7e 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -923,7 +923,10 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
923 923
924static int __init ntp_tick_adj_setup(char *str) 924static int __init ntp_tick_adj_setup(char *str)
925{ 925{
926 ntp_tick_adj = simple_strtol(str, NULL, 0); 926 int rc = kstrtol(str, 0, (long *)&ntp_tick_adj);
927
928 if (rc)
929 return rc;
927 ntp_tick_adj <<= NTP_SCALE_SHIFT; 930 ntp_tick_adj <<= NTP_SCALE_SHIFT;
928 931
929 return 1; 932 return 1;