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>
This commit is contained in:
parent
938edae11e
commit
dec56e6312
|
@ -9,9 +9,6 @@ struct sys_timer_ops {
|
||||||
int (*init)(void);
|
int (*init)(void);
|
||||||
int (*start)(void);
|
int (*start)(void);
|
||||||
int (*stop)(void);
|
int (*stop)(void);
|
||||||
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
|
||||||
unsigned long (*get_offset)(void);
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sys_timer {
|
struct sys_timer {
|
||||||
|
@ -26,13 +23,6 @@ struct sys_timer {
|
||||||
extern struct sys_timer tmu_timer;
|
extern struct sys_timer tmu_timer;
|
||||||
extern struct sys_timer *sys_timer;
|
extern struct sys_timer *sys_timer;
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
|
||||||
static inline unsigned long get_timer_offset(void)
|
|
||||||
{
|
|
||||||
return sys_timer->ops->get_offset();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* arch/sh/kernel/timers/timer.c */
|
/* arch/sh/kernel/timers/timer.c */
|
||||||
struct sys_timer *get_sys_timer(void);
|
struct sys_timer *get_sys_timer(void);
|
||||||
|
|
||||||
|
|
|
@ -83,13 +83,6 @@ static int __init rtc_generic_init(void)
|
||||||
}
|
}
|
||||||
module_init(rtc_generic_init);
|
module_init(rtc_generic_init);
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
|
|
||||||
u32 arch_gettimeoffset(void)
|
|
||||||
{
|
|
||||||
return get_timer_offset() * 1000;
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */
|
|
||||||
|
|
||||||
/* last time the RTC clock got updated */
|
/* last time the RTC clock got updated */
|
||||||
static long last_rtc_update;
|
static long last_rtc_update;
|
||||||
|
|
||||||
|
@ -185,7 +178,6 @@ struct clocksource clocksource_sh = {
|
||||||
.name = "SuperH",
|
.name = "SuperH",
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
|
|
||||||
unsigned long long sched_clock(void)
|
unsigned long long sched_clock(void)
|
||||||
{
|
{
|
||||||
unsigned long long cycles;
|
unsigned long long cycles;
|
||||||
|
@ -197,7 +189,6 @@ unsigned long long sched_clock(void)
|
||||||
cycles = clocksource_sh.read(&clocksource_sh);
|
cycles = clocksource_sh.read(&clocksource_sh);
|
||||||
return cyc2ns(&clocksource_sh, cycles);
|
return cyc2ns(&clocksource_sh, cycles);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static void __init sh_late_time_init(void)
|
static void __init sh_late_time_init(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue