From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752773AbbCKD12 (ORCPT ); Tue, 10 Mar 2015 23:27:28 -0400 Received: from m15-112.126.com ([220.181.15.112]:48090 "EHLO m15-112.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751600AbbCKD1Y (ORCPT ); Tue, 10 Mar 2015 23:27:24 -0400 From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Thomas Gleixner , Alessandro Zummo , John Stultz , Arnd Bergmann , linux-omap@vger.kernel.org, Tony Lindgren , linux-tegra@vger.kernel.org, Stephen Warren , linux390@de.ibm.com, Martin Schwidefsky , Ralf Baechle , Arnd Bergmann , Xunlei Pang Subject: [PATCH 8/8] time: Remove read_boot_clock() Date: Wed, 11 Mar 2015 11:24:37 +0800 Message-Id: <1426044277-22170-4-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426044277-22170-1-git-send-email-xlpang@126.com> References: <1426044277-22170-1-git-send-email-xlpang@126.com> X-CM-TRANSID: DMmowEBpY1t7tf9UtpRwAw--.964S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7CFWrtryrZr4fGr17JFWkWFg_yoW8tw1Upa y7Aw15G3yDJF4Uurn7t393Z347Kwn8tF47J3yfG34Fyry0qF1xKFyFk3yFvryDJF4fuws8 ZF10vFsxuw1UZrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jXBMNUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiJwq5v01sAr9rwwAAsf Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xunlei Pang 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 --- read_persistent_clock() and update_persistent_clock() are way more complex, so we will deal with them gradually in extra patchsets. include/linux/timekeeping.h | 1 - kernel/time/timekeeping.c | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index a7fa96b..72631e8 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -263,7 +263,6 @@ static inline bool has_persistent_clock(void) 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 0e5a696..d0ca908 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1066,28 +1066,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); -} - /* * timekeeping_init - Initializes the clocksource and common timekeeping values */ -- 1.9.1