From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757757AbbGQKIv (ORCPT ); Fri, 17 Jul 2015 06:08:51 -0400 Received: from mproxyhzb1.163.com ([123.58.178.201]:45024 "EHLO mproxyhzb1.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756567AbbGQKIu (ORCPT ); Fri, 17 Jul 2015 06:08:50 -0400 X-Greylist: delayed 1920 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Jul 2015 06:08:49 EDT From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: Xunlei Pang , Mikael Starvik , Jesper Nilsson , John Stultz , Arnd Bergmann Subject: [PATCH] cris: time: Cleanup of persistent clock stuff Date: Fri, 17 Jul 2015 17:31:26 +0800 Message-Id: <1437125486-17299-1-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: jtKowABXnViPy6hVO9hIAA--.7469S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tFW5WFy7uFW3CF1rCr1xKrg_yoW8Ww48pw 4fCrnrGr4UuryYq3WjkrZ7G345Jrn5Jr47JayxJ34rZF18Zr15CryvyrWkZ398KFyfuay7 uF4FkFnIyw48Ca7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jmVbgUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbi7xY6v1Uwy31ZWgAAss 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. Cc: Mikael Starvik Cc: Jesper Nilsson Cc: John Stultz Cc: Arnd Bergmann 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