From patchwork Wed Mar 11 03:24:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 448783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pa0-x239.google.com (mail-pa0-x239.google.com [IPv6:2607:f8b0:400e:c03::239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 526361400DE for ; Wed, 11 Mar 2015 14:25:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass reason="2048-bit key; unprotected key" header.d=googlegroups.com header.i=@googlegroups.com header.b=OaxrNUlK; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: by padfa1 with SMTP id fa1sf1753398pad.0 for ; Tue, 10 Mar 2015 20:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:content-type:precedence:mailing-list:list-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe; bh=PrwHhp9ore48MMzly5uyipYYV3NrVLS/Gg4otdwX+G8=; b=OaxrNUlK9zMGrBnSXDBEm3eydN4SNW+T2cGNRuGgLDjndQx9uVQIbwVLGc0pVvA7pa WV5s9h60uJtR5Fvqqe9fMpHa84V7y4tYuq+sF0SMEBUjPy436s3a/3WaXlIOPRR8IR5m xBOqr6KI+eFaobOP4T3ZzoqMSTpyfB0Q8opyKAkiryck1luSBOutLXvG4HcEQ0ywU1jO 1nC8khct7c/Jwx6xBixEqUNX1kqxe40q3cwkwkzz7JBbIJwk7xHqZlKPrJ4ExtEZgXKM ux/yvln5R1VjBExTOM1ofCh+8b7Lsu1q4CU1DhEYcgxXAp40iYeHqkG5SFR3awlgIi+n xv7w== X-Received: by 10.50.79.131 with SMTP id j3mr858245igx.16.1426044339664; Tue, 10 Mar 2015 20:25:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.107.18.161 with SMTP id 33ls269016ios.77.gmail; Tue, 10 Mar 2015 20:25:39 -0700 (PDT) X-Received: by 10.42.95.209 with SMTP id g17mr29064137icn.18.1426044339474; Tue, 10 Mar 2015 20:25:39 -0700 (PDT) Received: from m15-112.126.com (m15-112.126.com. [220.181.15.112]) by gmr-mx.google.com with ESMTP id g3si275887igr.2.2015.03.10.20.25.38 for ; Tue, 10 Mar 2015 20:25:39 -0700 (PDT) Received-SPF: pass (google.com: domain of xlpang@126.com designates 220.181.15.112 as permitted sender) client-ip=220.181.15.112; Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp2 (Coremail) with SMTP id DMmowEBpY1t7tf9UtpRwAw--.964S5; Wed, 11 Mar 2015 11:24:57 +0800 (CST) 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: [rtc-linux] [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 X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of xlpang@126.com designates 220.181.15.112 as permitted sender) smtp.mail=xlpang@126.com; dkim=pass header.i=@126.com; dmarc=pass (p=NONE dis=NONE) header.from=126.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , 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 */