From: Fabian Frederick <fabf@skynet.be>
Date: Thu, 22 May 2014 00:42:26 +0000 (+1000)
Subject: kernel/time/ntp.c: convert simple_strtol to kstrtol
X-Git-Tag: next-20140530~2^2~450
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47f159c26e4a50313684273ec394ef10bbabe041;p=karo-tx-linux.git

kernel/time/ntp.c: convert simple_strtol to kstrtol

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

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