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: 45617 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 24899214BF for ; Wed, 11 Mar 2015 03:27:37 +0000 (UTC) Received: by wivz2 with SMTP id z2sf5006384wiv.1 for ; Tue, 10 Mar 2015 20:27:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=o69P+GRQ42NY5BR8CS4S/0caWQ00Gqg2Xq2R0FB1iHw=; b=YiY08NJ6Ug1cmTYfP05svByE3H81qA5V7Q/g6r/XoR2yjk6n7QhjR4MNdWkNiWc5Bj afUKJxfOiJbdngsbNWzHLJQL15S/S7MnAAU/BDmNHEK5EziH5V/nWChZeOd8lF+0ktuL RTdJ9pQWX1kLsURvkzdcl6BBZb97wgYhnezOq5XIEI6GTeKT9WBoauB8YbmQAVsLcnDV 5Z1sft1hNECPrbNIgb8Ightwi8H7JypDUPPNigQ+y//5UcJPSRHAaYYbSZQ6oquGYl/J k+Y/XXXneQWB5TF9Eihiu+KwtPhkWb+VJDNcpUwZzZYdblbyMyUZupBfOS2pQNIfpQjC Q75g== X-Gm-Message-State: ALoCoQkaiBQqDtnkZK9TERLBJ9FQVf8ALHS/pp9DRijs0VYI7bGrZNJ5Dr+UzsuscFF3EwdCzKTA X-Received: by 10.180.208.12 with SMTP id ma12mr2849048wic.6.1426044456449; Tue, 10 Mar 2015 20:27:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.6 with SMTP id v6ls105351laa.13.gmail; Tue, 10 Mar 2015 20:27:36 -0700 (PDT) X-Received: by 10.112.161.66 with SMTP id xq2mr32962348lbb.103.1426044456238; Tue, 10 Mar 2015 20:27:36 -0700 (PDT) Received: from mail-la0-x234.google.com (mail-la0-x234.google.com. [2a00:1450:4010:c03::234]) by mx.google.com with ESMTPS id z5si1523214laj.60.2015.03.10.20.27.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2015 20:27:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::234 as permitted sender) client-ip=2a00:1450:4010:c03::234; Received: by labgq15 with SMTP id gq15so6062120lab.1 for ; Tue, 10 Mar 2015 20:27:36 -0700 (PDT) X-Received: by 10.152.30.103 with SMTP id r7mr29927787lah.76.1426044456112; Tue, 10 Mar 2015 20:27:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2515472lbj; Tue, 10 Mar 2015 20:27:34 -0700 (PDT) X-Received: by 10.66.118.129 with SMTP id km1mr73161807pab.112.1426044453496; Tue, 10 Mar 2015 20:27:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kx15si4164968pab.228.2015.03.10.20.27.32; Tue, 10 Mar 2015 20:27:33 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752776AbbCKD12 (ORCPT + 28 others); 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 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: [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 Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::234 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=126.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 */