[PATCH] arm64: cpufeatures: use min and max

[Mark Rutland]

On Thu, Apr 29, 2021 at 10:50:46PM +0200, Julia Lawall wrote:
> From: kernel test robot <lkp at intel.com>
> 
> Use min and max to make the effect more clear.
> 
> Generated by: scripts/coccinelle/misc/minmax.cocci
> 
> Fixes: 8636e3295ce3 ("coccinelle: misc: add minmax script")
> CC: Denis Efremov <efremov at linux.com>
> Reported-by: kernel test robot <lkp at intel.com>
> Signed-off-by: kernel test robot <lkp at intel.com>
> Signed-off-by: Julia Lawall <julia.lawall at inria.fr>

This looks like a nice cleanup, but it's not clear to me what the
intended inclusion path for this is, and to avoid fragility I think we
must include <linux/minmax.h> explicitly.

With that:

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

Thanks,
Mark.

> ---
> 
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux.git for-5.12
> head:   44e793b89bcfe586730f4c6ce3c66174dc07cb37
> commit: 8636e3295ce33515c50ef728f0ff3800d97f9f44 [1/5] coccinelle: misc: add minmax script
> :::::: branch date: 6 days ago
> :::::: commit date: 6 weeks ago
> 
>  cpufeature.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -695,14 +695,14 @@ static s64 arm64_ftr_safe_value(const st
>  		ret = ftrp->safe_val;
>  		break;
>  	case FTR_LOWER_SAFE:
> -		ret = new < cur ? new : cur;
> +		ret = min(new, cur);
>  		break;
>  	case FTR_HIGHER_OR_ZERO_SAFE:
>  		if (!cur || !new)
>  			break;
>  		fallthrough;
>  	case FTR_HIGHER_SAFE:
> -		ret = new > cur ? new : cur;
> +		ret = max(new, cur);
>  		break;
>  	default:
>  		BUG();