MIPS: r4k-bugs64: Drop CONFIG_CPU_MIPSR6 checks

The r4k-bugs64 code will no longer be built for MIPSr6 kernel
configurations, so there's no need to perform checks for MIPSr6 within
the code. Drop those redundant checks.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org

diff --git a/arch/mips/kernel/r4k-bugs64.c b/arch/mips/kernel/r4k-bugs64.c
index 6a7afe7ef4d356c005a90e711df0603a18302969..1ff19f1ea5caffcd16383e8691b997896827be1e 100644 (file)
--- a/arch/mips/kernel/r4k-bugs64.c
+++ b/arch/mips/kernel/r4k-bugs64.c
@@ -242,7 +242,7 @@ static __init void check_daddi(void)
        panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
 }
 
-int daddiu_bug = IS_ENABLED(CONFIG_CPU_MIPSR6) ? 0 : -1;
+int daddiu_bug = -1;
 
 static __init void check_daddiu(void)
 {
@@ -312,14 +312,11 @@ static __init void check_daddiu(void)
 
 void __init check_bugs64_early(void)
 {
-       if (!IS_ENABLED(CONFIG_CPU_MIPSR6)) {
-               check_mult_sh();
-               check_daddiu();
-       }
+       check_mult_sh();
+       check_daddiu();
 }
 
 void __init check_bugs64(void)
 {
-       if (!IS_ENABLED(CONFIG_CPU_MIPSR6))
-               check_daddi();
+       check_daddi();
 }