Received-SPF: pass (google.com: domain of linux-kernel+bounces-86607-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 29 Feb 2024 11:10:37 +0000
From: Mark Rutland <mark.rutland@arm.com>
To: Liao Chang <liaochang1@huawei.com>
Cc: catalin.marinas@arm.com, will@kernel.org, broonie@kernel.org,
	maz@kernel.org, joey.gouly@arm.com, kristina.martsenko@arm.com,
	ryan.roberts@arm.com, jeremy.linton@arm.com,
	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm64: cpufeatures: Clean up temporary variable to
 simplify code
Message-ID: <ZeBmLc9bLhT5qfrB@FVFF77S0Q05N>
References: <20240229105208.456704-1-liaochang1@huawei.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240229105208.456704-1-liaochang1@huawei.com>

On Thu, Feb 29, 2024 at 10:52:08AM +0000, Liao Chang wrote:
> Clean up one temporary variable to simplifiy code in capability
> detection.
> 
> Signed-off-by: Liao Chang <liaochang1@huawei.com>

This looks line a nice cleanup, so:

Acked-by: Mark Rutland <mark.rutland@arm.com>

For context, we removed the last other user of 'num' in commit:

  21fb26bfb01ffe0d ("arm64: alternatives: add alternative_has_feature_*()")

Mark.

> ---
>  arch/arm64/kernel/cpufeature.c | 8 ++------
>  1 file 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)
> -- 
> 2.34.1
>