From patchwork Fri May 29 14:46:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 49223 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D0A1A218E7 for ; Fri, 29 May 2015 14:49:14 +0000 (UTC) Received: by laat2 with SMTP id t2sf21316595laa.2 for ; Fri, 29 May 2015 07:49:13 -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=hZagL1KPxEr+j5P5RrNcxMUiWLauu2fY5FhvDybouZw=; b=I/8HO3rwKNrPLiEAhjePfWTG5rovrQAVHkGvC5Sb9JIXyub5sqBo8Q51q3RK4MN9lQ 25/z6dCtYoQOFAGGeg6CeiSLg/4OpL8niEf0O7lQR+5ytazaCznn5R3bipx7c+irJs1W iQwu4ZgF0nUCUEqPxBYPIp+nrnoWpMo+6c+rYFaceAm61zScZ+GjA7jAhUoQocSVwc7D AqUKqc2sdq+ra+RH5y4iXCj5iQadf5eVYTK2TFCAVuhwBoaZ85dxqz19z/QiDkq/sOq+ 7nu8m4/pnk7IZOsDZptsNY56AZampAlTnDTkSg1hMf6qTPQPiVHXo56zlhfkQE09W/A+ +ryQ== X-Gm-Message-State: ALoCoQmqPYFVG+ZrIjYUnvkas3tutxXAcbnUD5VkEl0LglmboNzp763LB9NwhPEEEWYSXry1Eoal X-Received: by 10.180.105.226 with SMTP id gp2mr3206544wib.1.1432910953779; Fri, 29 May 2015 07:49:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.74 with SMTP id ju10ls361160lab.23.gmail; Fri, 29 May 2015 07:49:13 -0700 (PDT) X-Received: by 10.152.87.235 with SMTP id bb11mr8234537lab.69.1432910953581; Fri, 29 May 2015 07:49:13 -0700 (PDT) Received: from mail-lb0-x236.google.com (mail-lb0-x236.google.com. [2a00:1450:4010:c04::236]) by mx.google.com with ESMTPS id yl6si4853795lbb.116.2015.05.29.07.49.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 May 2015 07:49:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::236 as permitted sender) client-ip=2a00:1450:4010:c04::236; Received: by lbbqq2 with SMTP id qq2so49999246lbb.3 for ; Fri, 29 May 2015 07:49:13 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr8175086lac.41.1432910953276; Fri, 29 May 2015 07:49:13 -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.108.230 with SMTP id hn6csp394273lbb; Fri, 29 May 2015 07:49:12 -0700 (PDT) X-Received: by 10.68.191.167 with SMTP id gz7mr15612837pbc.43.1432910952196; Fri, 29 May 2015 07:49:12 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cn10si8714371pac.193.2015.05.29.07.49.10; Fri, 29 May 2015 07:49:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756469AbbE2OtF (ORCPT + 28 others); Fri, 29 May 2015 10:49:05 -0400 Received: from m50-111.126.com ([123.125.50.111]:44998 "EHLO m50-111.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756298AbbE2OsO (ORCPT ); Fri, 29 May 2015 10:48:14 -0400 Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp5 (Coremail) with SMTP id jtKowAAHLTLCe2hVnOL+AA--.2718S5; Fri, 29 May 2015 22:46:55 +0800 (CST) From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Alessandro Zummo , John Stultz , Arnd Bergmann , "David S. Miller" , sparclinux@vger.kernel.org, linux-cris-kernel@axis.com, Mikael Starvik , Jesper Nilsson , Xunlei Pang Subject: [PATCH v2 4/4] cris: time: Cleanup of persistent clock stuff Date: Fri, 29 May 2015 22:46:18 +0800 Message-Id: <1432910778-314-4-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432910778-314-1-git-send-email-xlpang@126.com> References: <1432910778-314-1-git-send-email-xlpang@126.com> X-CM-TRANSID: jtKowAAHLTLCe2hVnOL+AA--.2718S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7WrW8tw1xZF1Utw1UtrW5Jrb_yoW8XF1kpa yfCrnrGr4j9ryYqF12k397W345JFs3Jrsrta4xJa4rZF18Zr15CrZ2yrWkZ398Kr97uay7 uFWFkFnxAw48Ca7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jXID7UUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbi6B8Jv1UJQN-PPQAAsw 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:c04::236 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 - Remove update_persistent_clock(), as it does nothing now. - Remove read_persistent_clock(), let it fall back to the weak version. Signed-off-by: Xunlei Pang --- arch/cris/Kconfig | 1 - arch/cris/kernel/time.c | 25 ------------------------- 2 files changed, 26 deletions(-) diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 0314e32..982d562 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -46,7 +46,6 @@ config CRIS select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_IRQ_SHOW select GENERIC_IOMAP - select GENERIC_CMOS_UPDATE select MODULES_USE_ELF_RELA select CLONE_BACKWARDS2 select OLD_SIGSUSPEND diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 7780d37..2dda6da 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c @@ -39,31 +39,6 @@ extern unsigned long loops_per_jiffy; /* init/main.c */ unsigned long loops_per_usec; -int set_rtc_mmss(unsigned long nowtime) -{ - D(printk(KERN_DEBUG "set_rtc_mmss(%lu)\n", nowtime)); - return 0; -} - -/* grab the time from the RTC chip */ -unsigned long get_cmos_time(void) -{ - return 0; -} - - -int update_persistent_clock(struct timespec now) -{ - return set_rtc_mmss(now.tv_sec); -} - -void read_persistent_clock(struct timespec *ts) -{ - ts->tv_sec = 0; - ts->tv_nsec = 0; -} - - extern void cris_profile_sample(struct pt_regs* regs); void