[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 <[email protected]>

diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index e4b5e647b14211ec5a904091924c24570b99889e..abadb8cb77c001174e15db22b201040100286361 100644 (file)
--- 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);
 }
 
        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.
  */
 /*
  * 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);
 }
 
 int (*mips_timer_state)(void);

-void (*mips_timer_ack)(void);

 
 /*
  * local_timer_interrupt() does profiling and process accounting
 
 /*
  * 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 (!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();
                }
                if (!mips_hpt_frequency)
                        mips_hpt_frequency = calibrate_hpt();


@@ -534,10 +517,6 @@ void __init time_init(void)
 #endif
        }
 
 #endif
        }
 

-       if (!mips_timer_ack)
-               /* No timer interrupt ack (e.g. i8254).  */
-               mips_timer_ack = null_timer_ack;
-

        /*
         * Call board specific timer interrupt setup.
         *
        /*
         * Call board specific timer interrupt setup.
         *

diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h
index 35555bd5c52d529a0720f216be336177ceef5620..ff514b400924b06024fb7d09e5c55e7c84b72ad4 100644 (file)
--- 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);
  * 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.
 
 /*
  * High precision timer clocksource.