Skip to content

Commit

Permalink
sh: Kill off the now unused ARCH_USES_GETTIMEOFFSET code.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed May 3, 2009
1 parent 938edae commit dec56e6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
10 changes: 0 additions & 10 deletions arch/sh/include/asm/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ struct sys_timer_ops {
int (*init)(void);
int (*start)(void);
int (*stop)(void);
#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
unsigned long (*get_offset)(void);
#endif
};

struct sys_timer {
Expand All @@ -26,13 +23,6 @@ struct sys_timer {
extern struct sys_timer tmu_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 */
struct sys_timer *get_sys_timer(void);

Expand Down
9 changes: 0 additions & 9 deletions arch/sh/kernel/time_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@ static int __init rtc_generic_init(void)
}
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 */
static long last_rtc_update;

Expand Down Expand Up @@ -185,7 +178,6 @@ struct clocksource clocksource_sh = {
.name = "SuperH",
};

#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
unsigned long long sched_clock(void)
{
unsigned long long cycles;
Expand All @@ -197,7 +189,6 @@ unsigned long long sched_clock(void)
cycles = clocksource_sh.read(&clocksource_sh);
return cyc2ns(&clocksource_sh, cycles);
}
#endif

static void __init sh_late_time_init(void)
{
Expand Down

0 comments on commit dec56e6

Please sign in to comment.