arm64: cpufeatures: use min and max
Use min and max to make the effect more clear. Generated by: scripts/coccinelle/misc/minmax.cocci CC: Denis Efremov <efremov@linux.com> Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: kernel test robot <lkp@intel.com> Signed-off-by: Julia Lawall <julia.lawall@inria.fr> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/alpine.DEB.2.22.394.2104292246300.16899@hadrien [catalin.marinas@arm.com: include <linux/minmax.h> explicitly] Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Родитель
8533d5bfad
Коммит
f6334b1798
|
@ -68,6 +68,7 @@
|
||||||
#include <linux/sort.h>
|
#include <linux/sort.h>
|
||||||
#include <linux/stop_machine.h>
|
#include <linux/stop_machine.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
#include <linux/minmax.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
#include <linux/kasan.h>
|
#include <linux/kasan.h>
|
||||||
|
@ -695,14 +696,14 @@ static s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new,
|
||||||
ret = ftrp->safe_val;
|
ret = ftrp->safe_val;
|
||||||
break;
|
break;
|
||||||
case FTR_LOWER_SAFE:
|
case FTR_LOWER_SAFE:
|
||||||
ret = new < cur ? new : cur;
|
ret = min(new, cur);
|
||||||
break;
|
break;
|
||||||
case FTR_HIGHER_OR_ZERO_SAFE:
|
case FTR_HIGHER_OR_ZERO_SAFE:
|
||||||
if (!cur || !new)
|
if (!cur || !new)
|
||||||
break;
|
break;
|
||||||
fallthrough;
|
fallthrough;
|
||||||
case FTR_HIGHER_SAFE:
|
case FTR_HIGHER_SAFE:
|
||||||
ret = new > cur ? new : cur;
|
ret = max(new, cur);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
BUG();
|
BUG();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче