From 2cfa7660dbf94a61b9d43edaa84be454f9dc25fc Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 18 Oct 2007 16:00:19 +0100 Subject: [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 --- arch/mips/kernel/time.c | 21 --------------------- include/asm-mips/time.h | 1 - 2 files changed, 22 deletions(-) diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index e4b5e647b14..abadb8cb77c 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -72,14 +72,6 @@ int update_persistent_clock(struct timespec now) return rtc_mips_set_mmss(now.tv_sec); } -/* how many counter cycles in a jiffy */ -static unsigned long cycles_per_jiffy __read_mostly; - -/* - * Null timer ack for systems not needing one (e.g. i8254). - */ -static void null_timer_ack(void) { /* nothing */ } - /* * Null high precision timer functions for systems lacking one. */ @@ -105,7 +97,6 @@ static cycle_t c0_hpt_read(void) } int (*mips_timer_state)(void); -void (*mips_timer_ack)(void); /* * local_timer_interrupt() does profiling and process accounting @@ -512,14 +503,6 @@ void __init time_init(void) if (!clocksource_mips.read) { /* No external high precision timer -- use R4k. */ clocksource_mips.read = c0_hpt_read; - - if (!mips_timer_state) { - /* No external timer interrupt -- use R4k. */ - mips_timer_ack = c0_timer_ack; - /* Calculate cache parameters. */ - cycles_per_jiffy = - (mips_hpt_frequency + HZ / 2) / HZ; - } } if (!mips_hpt_frequency) mips_hpt_frequency = calibrate_hpt(); @@ -534,10 +517,6 @@ void __init time_init(void) #endif } - if (!mips_timer_ack) - /* No timer interrupt ack (e.g. i8254). */ - mips_timer_ack = null_timer_ack; - /* * Call board specific timer interrupt setup. * diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index 35555bd5c52..ff514b40092 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); * mips_timer_ack may be NULL if the interrupt is self-recoverable. */ extern int (*mips_timer_state)(void); -extern void (*mips_timer_ack)(void); /* * High precision timer clocksource. -- cgit v1.2.3