diff mbox

[3/3] time: Remove read_boot_clock()

Message ID 1428541482-3181-3-git-send-email-xlpang@126.com
State Superseded
Headers show

Commit Message

Xunlei Pang April 9, 2015, 1:04 a.m. UTC 
From: Xunlei Pang <pang.xunlei@linaro.org>

Now we have all the read_boot_clock64() for all implementations,
it's time to remove read_boot_clock() completely from the kernel.

Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
---
 include/linux/timekeeping.h |  1 -
 kernel/time/timekeeping.c   | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

Comments

John Stultz May 13, 2015, 11:44 p.m. UTC | #1 
On Fri, Apr 24, 2015 at 12:27 AM,  <pang.xunlei@zte.com.cn> wrote:
> Ping
>
> linux-kernel-owner@vger.kernel.org wrote 2015-04-09 AM 09:04:42:
>
>>
>> [PATCH 3/3] time: Remove read_boot_clock()
>>
>> From: Xunlei Pang <pang.xunlei@linaro.org>
>>
>> Now we have all the read_boot_clock64() for all implementations,
>> it's time to remove read_boot_clock() completely from the kernel.
>>
>> Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>

Queued for testing & hopefully 4.2

thanks
-john
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 99176af..88e5f2e 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -266,7 +266,6 @@  extern int persistent_clock_is_local;
 
 extern void read_persistent_clock(struct timespec *ts);
 extern void read_persistent_clock64(struct timespec64 *ts);
-extern void read_boot_clock(struct timespec *ts);
 extern void read_boot_clock64(struct timespec64 *ts);
 extern int update_persistent_clock(struct timespec now);
 extern int update_persistent_clock64(struct timespec64 now);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 946acb7..87f0ea5 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1179,28 +1179,20 @@  void __weak read_persistent_clock64(struct timespec64 *ts64)
 }
 
 /**
- * read_boot_clock -  Return time of the system start.
+ * read_boot_clock64 -  Return time of the system start.
  *
  * Weak dummy function for arches that do not yet support it.
  * Function to read the exact time the system has been started.
- * Returns a timespec with tv_sec=0 and tv_nsec=0 if unsupported.
+ * Returns a timespec64 with tv_sec=0 and tv_nsec=0 if unsupported.
  *
  *  XXX - Do be sure to remove it once all arches implement it.
  */
-void __weak read_boot_clock(struct timespec *ts)
+void __weak read_boot_clock64(struct timespec64 *ts)
 {
 	ts->tv_sec = 0;
 	ts->tv_nsec = 0;
 }
 
-void __weak read_boot_clock64(struct timespec64 *ts64)
-{
-	struct timespec ts;
-
-	read_boot_clock(&ts);
-	*ts64 = timespec_to_timespec64(ts);
-}
-
 /* Flag for if timekeeping_resume() has injected sleeptime */
 static bool sleeptime_injected;