diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-18 11:00:19 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-18 13:11:47 -0400 |
commit | 2cfa7660dbf94a61b9d43edaa84be454f9dc25fc (patch) | |
tree | 634bbdec33888bce17cfd2f32e5e6a9e407847bf | |
parent | 76d3a7a54cbd40c979d9914f53066ff67f8463f5 (diff) |
[MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack
cycles_per_jiffy was only ever getting assigned and the function pointer
not being called anymore and mips_timer_ack had gotten similarly stale. I
leave the remaining assignments unfixed as a lighthouse pointing platform
maintainers to what needs a rewrite. These changes make null_timer_ack()
unreferenced, so delete that too.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/time.c | 21 | ||||
-rw-r--r-- | include/asm-mips/time.h | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index e4b5e647b142..abadb8cb77c0 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
@@ -72,14 +72,6 @@ int update_persistent_clock(struct timespec now) | |||
72 | return rtc_mips_set_mmss(now.tv_sec); | 72 | return rtc_mips_set_mmss(now.tv_sec); |
73 | } | 73 | } |
74 | 74 | ||
75 | /* how many counter cycles in a jiffy */ | ||
76 | static unsigned long cycles_per_jiffy __read_mostly; | ||
77 | |||
78 | /* | ||
79 | * Null timer ack for systems not needing one (e.g. i8254). | ||
80 | */ | ||
81 | static void null_timer_ack(void) { /* nothing */ } | ||
82 | |||
83 | /* | 75 | /* |
84 | * Null high precision timer functions for systems lacking one. | 76 | * Null high precision timer functions for systems lacking one. |
85 | */ | 77 | */ |
@@ -105,7 +97,6 @@ static cycle_t c0_hpt_read(void) | |||
105 | } | 97 | } |
106 | 98 | ||
107 | int (*mips_timer_state)(void); | 99 | int (*mips_timer_state)(void); |
108 | void (*mips_timer_ack)(void); | ||
109 | 100 | ||
110 | /* | 101 | /* |
111 | * local_timer_interrupt() does profiling and process accounting | 102 | * local_timer_interrupt() does profiling and process accounting |
@@ -512,14 +503,6 @@ void __init time_init(void) | |||
512 | if (!clocksource_mips.read) { | 503 | if (!clocksource_mips.read) { |
513 | /* No external high precision timer -- use R4k. */ | 504 | /* No external high precision timer -- use R4k. */ |
514 | clocksource_mips.read = c0_hpt_read; | 505 | clocksource_mips.read = c0_hpt_read; |
515 | |||
516 | if (!mips_timer_state) { | ||
517 | /* No external timer interrupt -- use R4k. */ | ||
518 | mips_timer_ack = c0_timer_ack; | ||
519 | /* Calculate cache parameters. */ | ||
520 | cycles_per_jiffy = | ||
521 | (mips_hpt_frequency + HZ / 2) / HZ; | ||
522 | } | ||
523 | } | 506 | } |
524 | if (!mips_hpt_frequency) | 507 | if (!mips_hpt_frequency) |
525 | mips_hpt_frequency = calibrate_hpt(); | 508 | mips_hpt_frequency = calibrate_hpt(); |
@@ -534,10 +517,6 @@ void __init time_init(void) | |||
534 | #endif | 517 | #endif |
535 | } | 518 | } |
536 | 519 | ||
537 | if (!mips_timer_ack) | ||
538 | /* No timer interrupt ack (e.g. i8254). */ | ||
539 | mips_timer_ack = null_timer_ack; | ||
540 | |||
541 | /* | 520 | /* |
542 | * Call board specific timer interrupt setup. | 521 | * Call board specific timer interrupt setup. |
543 | * | 522 | * |
diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index 35555bd5c52d..ff514b400924 100644 --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h | |||
@@ -40,7 +40,6 @@ extern int rtc_mips_set_mmss(unsigned long); | |||
40 | * mips_timer_ack may be NULL if the interrupt is self-recoverable. | 40 | * mips_timer_ack may be NULL if the interrupt is self-recoverable. |
41 | */ | 41 | */ |
42 | extern int (*mips_timer_state)(void); | 42 | extern int (*mips_timer_state)(void); |
43 | extern void (*mips_timer_ack)(void); | ||
44 | 43 | ||
45 | /* | 44 | /* |
46 | * High precision timer clocksource. | 45 | * High precision timer clocksource. |