MIPS: Remove cpu_has_6k_cache and cpu_has_8k_cache in cpu_cache_init()

Since commit 02cf2119684e ("Cleanup the mess in cpu_cache_init."),
cpu_has_6k_cache and cpu_has_8k_cache have no user, r6k_cache_init()
and r8k_cache_init() are not defined for over 15 years, just remove
them.

Signed-off-by: Tiezhu Yang <[email protected]>
Signed-off-by: Thomas Bogendoerfer <[email protected]>

diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index f2e216eef7da5ec78cbb31e02843021ffd59f9a0..336e02b3b3cea5d357b58f556ba9efbbe48fb9c7 100644 (file)
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -115,8 +115,6 @@
 #ifndef cpu_has_3k_cache
 #define cpu_has_3k_cache       __isa_lt_and_opt(1, MIPS_CPU_3K_CACHE)
 #endif
-#define cpu_has_6k_cache       0
-#define cpu_has_8k_cache       0
 #ifndef cpu_has_4k_cache
 #define cpu_has_4k_cache       __isa_ge_or_opt(1, MIPS_CPU_4K_CACHE)
 #endif

diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 36bcf4e955e87736e5a53ea4c5384eccc3ce9dea..23b16bfd97b2356ed55bd87d52db5284ed261809 100644 (file)
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -188,21 +188,11 @@ void cpu_cache_init(void)
 
                r3k_cache_init();
        }
-       if (cpu_has_6k_cache) {
-               extern void __weak r6k_cache_init(void);
-
-               r6k_cache_init();
-       }
        if (cpu_has_4k_cache) {
                extern void __weak r4k_cache_init(void);
 
                r4k_cache_init();
        }
-       if (cpu_has_8k_cache) {
-               extern void __weak r8k_cache_init(void);
-
-               r8k_cache_init();
-       }
        if (cpu_has_tx39_cache) {
                extern void __weak tx39_cache_init(void);