Commit cbc59c9a authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon

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: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20231129111555.3594833-57-ardb@google.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent 2cc14f52
......@@ -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));
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment