* [PATCH] cris: time: Cleanup of persistent clock stuff
@ 2015-07-17 9:31 Xunlei Pang
2015-07-17 18:31 ` Rabin Vincent
2015-10-01 20:18 ` Jesper Nilsson
0 siblings, 2 replies; 3+ messages in thread
From: Xunlei Pang @ 2015-07-17 9:31 UTC (permalink / raw)
To: linux-kernel
Cc: Xunlei Pang, Mikael Starvik, Jesper Nilsson, John Stultz, Arnd Bergmann
From: Xunlei Pang <pang.xunlei@linaro.org>
- Remove update_persistent_clock(), as it does nothing now.
- Remove read_persistent_clock(), let it fall back to the weak version.
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cris: time: Cleanup of persistent clock stuff
2015-07-17 9:31 [PATCH] cris: time: Cleanup of persistent clock stuff Xunlei Pang
@ 2015-07-17 18:31 ` Rabin Vincent
2015-10-01 20:18 ` Jesper Nilsson
1 sibling, 0 replies; 3+ messages in thread
From: Rabin Vincent @ 2015-07-17 18:31 UTC (permalink / raw)
To: Xunlei Pang
Cc: linux-kernel, Xunlei Pang, Mikael Starvik, Jesper Nilsson,
John Stultz, Arnd Bergmann
On Fri, Jul 17, 2015 at 05:31:26PM +0800, Xunlei Pang wrote:
> From: Xunlei Pang <pang.xunlei@linaro.org>
>
> - Remove update_persistent_clock(), as it does nothing now.
> - Remove read_persistent_clock(), let it fall back to the weak version.
>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Acked-by: Rabin Vincent <rabin@rab.in>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cris: time: Cleanup of persistent clock stuff
2015-07-17 9:31 [PATCH] cris: time: Cleanup of persistent clock stuff Xunlei Pang
2015-07-17 18:31 ` Rabin Vincent
@ 2015-10-01 20:18 ` Jesper Nilsson
1 sibling, 0 replies; 3+ messages in thread
From: Jesper Nilsson @ 2015-10-01 20:18 UTC (permalink / raw)
To: Xunlei Pang
Cc: linux-kernel, Xunlei Pang, Mikael Starvik, Jesper Nilsson,
John Stultz, Arnd Bergmann
On Fri, Jul 17, 2015 at 05:31:26PM +0800, Xunlei Pang wrote:
> From: Xunlei Pang <pang.xunlei@linaro.org>
>
> - Remove update_persistent_clock(), as it does nothing now.
> - Remove read_persistent_clock(), let it fall back to the weak version.
Thanks, applied to the cris tree.
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-01 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-17 9:31 [PATCH] cris: time: Cleanup of persistent clock stuff Xunlei Pang
2015-07-17 18:31 ` Rabin Vincent
2015-10-01 20:18 ` Jesper Nilsson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.