diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-03-04 12:04:38 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-04 12:04:38 -0500 |
commit | 0272282f7cffb469cd2676dcb6e58bc942fcf8a8 (patch) | |
tree | 2c1d122cc112e09b5148c40877a1ad316adcc51c /arch/sh/kernel/time.c | |
parent | 62c8cbbfc2367e706317f56ac21959120ae72773 (diff) |
sh: Convert sh to use read/update_persistent_clock
This patch converts the sh architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/time.c')
-rw-r--r-- | arch/sh/kernel/time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 953fa1613312..8a0072de2bcc 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c | |||
@@ -39,12 +39,12 @@ static int null_rtc_set_time(const time_t secs) | |||
39 | void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time; | 39 | void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time; |
40 | int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; | 40 | int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; |
41 | 41 | ||
42 | #ifdef CONFIG_GENERIC_CMOS_UPDATE | ||
43 | void read_persistent_clock(struct timespec *ts) | 42 | void read_persistent_clock(struct timespec *ts) |
44 | { | 43 | { |
45 | rtc_sh_get_time(ts); | 44 | rtc_sh_get_time(ts); |
46 | } | 45 | } |
47 | 46 | ||
47 | #ifdef CONFIG_GENERIC_CMOS_UPDATE | ||
48 | int update_persistent_clock(struct timespec now) | 48 | int update_persistent_clock(struct timespec now) |
49 | { | 49 | { |
50 | return rtc_sh_set_time(now.tv_sec); | 50 | return rtc_sh_set_time(now.tv_sec); |
@@ -113,9 +113,5 @@ void __init time_init(void) | |||
113 | hwblk_init(); | 113 | hwblk_init(); |
114 | clk_init(); | 114 | clk_init(); |
115 | 115 | ||
116 | rtc_sh_get_time(&xtime); | ||
117 | set_normalized_timespec(&wall_to_monotonic, | ||
118 | -xtime.tv_sec, -xtime.tv_nsec); | ||
119 | |||
120 | late_time_init = sh_late_time_init; | 116 | late_time_init = sh_late_time_init; |
121 | } | 117 | } |