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>

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 8d1a634a403eed6e13a210331a8f25133354ca28..0e900b23f7ab3d3045c7f145fd7688ba26fbfbb3 100644 (file)
--- 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)