arm64: idreg-override: Omit non-NULL checks for override pointer

Now that override pointers are always set, we can drop the various
non-NULL checks that we have in the code.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20231129111555.3594833-57-ardb@google.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c
index 3addc09f874615a5be5a6fa567e93c4f278025ae..536bc33859bcbecce6983ebd59ce084199e785f5 100644 (file)
--- a/arch/arm64/kernel/idreg-override.c
+++ b/arch/arm64/kernel/idreg-override.c
@@ -216,9 +216,6 @@ static void __init match_options(const char *cmdline)
        for (i = 0; i < ARRAY_SIZE(regs); i++) {
                int f;
 
-               if (!regs[i]->override)
-                       continue;
-
                for (f = 0; strlen(regs[i]->fields[f].name); f++) {
                        u64 shift = regs[i]->fields[f].shift;
                        u64 width = regs[i]->fields[f].width ?: 4;
@@ -319,10 +316,8 @@ asmlinkage void __init init_feature_override(u64 boot_status)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(regs); i++) {
-               if (regs[i]->override) {
-                       regs[i]->override->val  = 0;
-                       regs[i]->override->mask = 0;
-               }
+               regs[i]->override->val  = 0;
+               regs[i]->override->mask = 0;
        }
 
        __boot_status = boot_status;
@@ -330,9 +325,8 @@ asmlinkage void __init init_feature_override(u64 boot_status)
        parse_cmdline();
 
        for (i = 0; i < ARRAY_SIZE(regs); i++) {
-               if (regs[i]->override)
-                       dcache_clean_inval_poc((unsigned long)regs[i]->override,
-                                           (unsigned long)regs[i]->override +
-                                           sizeof(*regs[i]->override));
+               dcache_clean_inval_poc((unsigned long)regs[i]->override,
+                                      (unsigned long)regs[i]->override +
+                                      sizeof(*regs[i]->override));
        }
 }