]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
kernel/time/ntp.c: convert simple_strtol to kstrtol
authorFabian Frederick <fabf@skynet.be>
Thu, 22 May 2014 00:42:26 +0000 (10:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 May 2014 00:42:26 +0000 (10:42 +1000)
Replace obsolete function.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
kernel/time/ntp.c

index 419a52cecd20c4fa2cac2fab666b1be48a4e9f4b..82b7c9edba7eb396dda42f9e30592c4414ef1f00 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;