ntp: Convert simple_strtol to kstrtol
authorFabian Frederick <fabf@skynet.be>
Fri, 9 May 2014 18:32:25 +0000 (20:32 +0200)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 12 May 2014 17:09:25 +0000 (10:09 -0700)
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>
kernel/time/ntp.c

index 419a52c..82b7c9e 100644 (file)
@@ -923,7 +923,10 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
 
 static int __init ntp_tick_adj_setup(char *str)
 {
-       ntp_tick_adj = simple_strtol(str, NULL, 0);
+       int rc = kstrtol(str, 0, (long *)&ntp_tick_adj);
+
+       if (rc)
+               return rc;
        ntp_tick_adj <<= NTP_SCALE_SHIFT;
 
        return 1;