---

yaml --- r: 78048 b: refs/heads/master c: c966234 h: refs/heads/master v: v3
git-mirror · Jan 29, 2008 · ebba095 · ebba095
1 parent c42d67d
commit ebba095
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa71c96002d1b02cd1ba1a4477d4b8ad95b587f9
+refs/heads/master: c9662341f8a09cffd7234a89cc066c342fe343bf
diff --git a/trunk/arch/mips/dec/time.c b/trunk/arch/mips/dec/time.c
@@ -161,7 +161,6 @@ static cycle_t dec_ioasic_hpt_read(void)
 
 void __init plat_time_init(void)
 {
-	mips_timer_state = dec_timer_state;
 	mips_timer_ack = dec_timer_ack;
 
 	if (!cpu_has_counter && IOASIC)

diff --git a/trunk/arch/mips/kernel/time.c b/trunk/arch/mips/kernel/time.c
@@ -50,8 +50,6 @@ int update_persistent_clock(struct timespec now)
 	return rtc_mips_set_mmss(now.tv_sec);
 }
 
-int (*mips_timer_state)(void);
-
 int null_perf_irq(void)
 {
 	return 0;

diff --git a/trunk/include/asm-mips/time.h b/trunk/include/asm-mips/time.h
@@ -30,21 +30,14 @@ extern spinlock_t rtc_lock;
 extern int rtc_mips_set_time(unsigned long);
 extern int rtc_mips_set_mmss(unsigned long);
 
-/*
- * Timer interrupt functions.
- * mips_timer_state is needed for high precision timer calibration.
- */
-extern int (*mips_timer_state)(void);
-
 /*
  * board specific routines required by time_init().
  */
 extern void plat_time_init(void);
 
 /*
  * mips_hpt_frequency - must be set if you intend to use an R4k-compatible
- * counter as a timer interrupt source; otherwise it can be set up
- * automagically with an aid of mips_timer_state.
+ * counter as a timer interrupt source.
  */
 extern unsigned int mips_hpt_frequency;