summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLiao Chang <liaochang1@huawei.com>2024-02-29 13:52:08 +0300
committerCatalin Marinas <catalin.marinas@arm.com>2024-03-01 20:35:53 +0300
commit622442666dcca0f273fd8b1adf80cd1893ed88cf (patch)
treef2495fdaa2d14a0fbdd4740d0277a86272e1de32 /arch
parent6d1ce806e17fcabe91a912363cc1a5f108734627 (diff)
downloadlinux-622442666dcca0f273fd8b1adf80cd1893ed88cf.tar.xz
arm64: cpufeatures: Clean up temporary variable to simplify code
Clean up one temporary variable to simplifiy code in capability detection. Signed-off-by: Liao Chang <liaochang1@huawei.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20240229105208.456704-1-liaochang1@huawei.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/cpufeature.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 8d1a634a403e..0e900b23f7ab 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -3052,13 +3052,9 @@ static void __init enable_cpu_capabilities(u16 scope_mask)
boot_scope = !!(scope_mask & SCOPE_BOOT_CPU);
for (i = 0; i < ARM64_NCAPS; i++) {
- unsigned int num;
-
caps = cpucap_ptrs[i];
- if (!caps || !(caps->type & scope_mask))
- continue;
- num = caps->capability;
- if (!cpus_have_cap(num))
+ if (!caps || !(caps->type & scope_mask) ||
+ !cpus_have_cap(caps->capability))
continue;
if (boot_scope && caps->cpu_enable)