From patchwork Thu Apr 9 01:04:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 46897 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0A23320D10 for ; Thu, 9 Apr 2015 01:07:06 +0000 (UTC) Received: by labgx2 with SMTP id gx2sf23542900lab.1 for ; Wed, 08 Apr 2015 18:07:05 -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=opj7MdWkKCS4UeFiIM1ve7E3r/16t/SDDDcrAz6fv1E=; b=gS55cikEDFPCDpBTOnW04c1cnvGflUhgZk4v627rpcRP4cx/Pxs1Dw7p5j6M9e/Tno WZesTz8LiSgEx2aiV7jjCjCKHKqUZ+eATcoto29deUJh6gq861uueUGU0tkhUAS8VIVp Kj1l6uL8yH/Ode42txa9scSrc4jo20AkFlRH9jirzO6oLGWa+0iUT9ZDW8UpkNLLzK0q ueqOPGkWznlySFkGKdAFYJQ07pe2xFlhbeL/Z8lyDJv2WrbC4AejVSFO4m0+rB6vba9W dqusx7L8Tmsibo0AYyWWuP2L5ELJ4r8jTGjou6czbBNLFnP/EX16vmnMSLv/GG3gFN81 V8bA== X-Gm-Message-State: ALoCoQnvksAlymMYJLk/rgzS0S2b79Evkqz/fi8OTNMgrFYLyLjUwCXR+N22DJfnmWQRpInMBN63 X-Received: by 10.152.163.99 with SMTP id yh3mr263093lab.8.1428541624953; Wed, 08 Apr 2015 18:07:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.36 with SMTP id g4ls256534lah.33.gmail; Wed, 08 Apr 2015 18:07:04 -0700 (PDT) X-Received: by 10.112.124.166 with SMTP id mj6mr25801711lbb.104.1428541624713; Wed, 08 Apr 2015 18:07:04 -0700 (PDT) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com. [2a00:1450:4010:c03::231]) by mx.google.com with ESMTPS id cs3si10133546lbb.138.2015.04.08.18.07.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Apr 2015 18:07:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::231 as permitted sender) client-ip=2a00:1450:4010:c03::231; Received: by labbd9 with SMTP id bd9so67204593lab.2 for ; Wed, 08 Apr 2015 18:07:04 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr2276644lac.41.1428541624627; Wed, 08 Apr 2015 18:07:04 -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.67.65 with SMTP id l1csp176756lbt; Wed, 8 Apr 2015 18:07:03 -0700 (PDT) X-Received: by 10.70.91.167 with SMTP id cf7mr50838070pdb.7.1428541622758; Wed, 08 Apr 2015 18:07:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id co6si18977166pdb.91.2015.04.08.18.07.01; Wed, 08 Apr 2015 18:07:02 -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 S932358AbbDIBG6 (ORCPT + 27 others); Wed, 8 Apr 2015 21:06:58 -0400 Received: from m50-110.126.com ([123.125.50.110]:50583 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754938AbbDIBG4 (ORCPT ); Wed, 8 Apr 2015 21:06:56 -0400 Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp4 (Coremail) with SMTP id jdKowAAHDPQu0CVVDnXtAA--.11469S4; Thu, 09 Apr 2015 09:04:54 +0800 (CST) From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: John Stultz , Arnd Bergmann , Thomas Gleixner , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, Xunlei Pang Subject: [PATCH 3/3] time: Remove read_boot_clock() Date: Thu, 9 Apr 2015 09:04:42 +0800 Message-Id: <1428541482-3181-3-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428541482-3181-1-git-send-email-xlpang@126.com> References: <1428541482-3181-1-git-send-email-xlpang@126.com> X-CM-TRANSID: jdKowAAHDPQu0CVVDnXtAA--.11469S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7CFWrtr4xKw4xXw18Jw4DXFb_yoW8uFyfpF W2kw1UGrWDJF4Uurn2y393Z347Kwn8tF47t3yfu34Fyry0qF1xtr1rC3yFvryDJF4fuws8 ZF10vFsI9w1UZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkrcfUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXBbWv1R0VkNuWwAAsj 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::231 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 --- 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 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;