diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 05:18:14 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 05:18:14 -0400 |
commit | dec56e6312434b2536fedf9d7e9e73d666aaf0a8 (patch) | |
tree | 74a85790e34e1f42613e1aa66717498f387c2799 /arch/sh | |
parent | 938edae11ee3a7b20b6d754074a0f2c2edc4534b (diff) |
sh: Kill off the now unused ARCH_USES_GETTIMEOFFSET code.
Now that the stragglers (MTU2/CMT/etc.) have been rewritten and we are
selecting both GENERIC_TIME and GENERIC_CLOCKEVENTS, the get_offset()
timer op is completely unused. As a result, we are now able to kill off
the ARCH_USES_GETTIMEOFFSET references.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/timer.h | 10 | ||||
-rw-r--r-- | arch/sh/kernel/time_32.c | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/sh/include/asm/timer.h b/arch/sh/include/asm/timer.h index 581e3fe3fe04..cb16645d8397 100644 --- a/arch/sh/include/asm/timer.h +++ b/arch/sh/include/asm/timer.h | |||
@@ -9,9 +9,6 @@ struct sys_timer_ops { | |||
9 | int (*init)(void); | 9 | int (*init)(void); |
10 | int (*start)(void); | 10 | int (*start)(void); |
11 | int (*stop)(void); | 11 | int (*stop)(void); |
12 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
13 | unsigned long (*get_offset)(void); | ||
14 | #endif | ||
15 | }; | 12 | }; |
16 | 13 | ||
17 | struct sys_timer { | 14 | struct sys_timer { |
@@ -26,13 +23,6 @@ struct sys_timer { | |||
26 | extern struct sys_timer tmu_timer; | 23 | extern struct sys_timer tmu_timer; |
27 | extern struct sys_timer *sys_timer; | 24 | extern struct sys_timer *sys_timer; |
28 | 25 | ||
29 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
30 | static inline unsigned long get_timer_offset(void) | ||
31 | { | ||
32 | return sys_timer->ops->get_offset(); | ||
33 | } | ||
34 | #endif | ||
35 | |||
36 | /* arch/sh/kernel/timers/timer.c */ | 26 | /* arch/sh/kernel/timers/timer.c */ |
37 | struct sys_timer *get_sys_timer(void); | 27 | struct sys_timer *get_sys_timer(void); |
38 | 28 | ||
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c index 9d34dff14994..d41ca4cf20cf 100644 --- a/arch/sh/kernel/time_32.c +++ b/arch/sh/kernel/time_32.c | |||
@@ -83,13 +83,6 @@ static int __init rtc_generic_init(void) | |||
83 | } | 83 | } |
84 | module_init(rtc_generic_init); | 84 | module_init(rtc_generic_init); |
85 | 85 | ||
86 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
87 | u32 arch_gettimeoffset(void) | ||
88 | { | ||
89 | return get_timer_offset() * 1000; | ||
90 | } | ||
91 | #endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */ | ||
92 | |||
93 | /* last time the RTC clock got updated */ | 86 | /* last time the RTC clock got updated */ |
94 | static long last_rtc_update; | 87 | static long last_rtc_update; |
95 | 88 | ||
@@ -185,7 +178,6 @@ struct clocksource clocksource_sh = { | |||
185 | .name = "SuperH", | 178 | .name = "SuperH", |
186 | }; | 179 | }; |
187 | 180 | ||
188 | #ifndef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
189 | unsigned long long sched_clock(void) | 181 | unsigned long long sched_clock(void) |
190 | { | 182 | { |
191 | unsigned long long cycles; | 183 | unsigned long long cycles; |
@@ -197,7 +189,6 @@ unsigned long long sched_clock(void) | |||
197 | cycles = clocksource_sh.read(&clocksource_sh); | 189 | cycles = clocksource_sh.read(&clocksource_sh); |
198 | return cyc2ns(&clocksource_sh, cycles); | 190 | return cyc2ns(&clocksource_sh, cycles); |
199 | } | 191 | } |
200 | #endif | ||
201 | 192 | ||
202 | static void __init sh_late_time_init(void) | 193 | static void __init sh_late_time_init(void) |
203 | { | 194 | { |