From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756467AbbE2OtF (ORCPT ); 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 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- 1.9.1