[PATCH] arm64: Do not use the deprecated cpumask_next_wrap() in arch_freq_get_on_cpu()

From: Catalin Marinas
Date: Tue Feb 18 2025 - 13:20:46 EST


cpumask_next_wrap() will soon disappear in its current form. Use
for_each_cpu_wrap() instead.

Fixes: 16d1e27475f6 ("arm64: Provide an AMU-based version of arch_freq_get_on_cpu")
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
---
arch/arm64/kernel/topology.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index a09b0551ec59..1544d3648554 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -254,7 +254,7 @@ int arch_freq_get_on_cpu(int cpu)
if (!housekeeping_cpu(cpu, HK_TYPE_TICK) ||
time_is_before_jiffies(last_update + msecs_to_jiffies(AMU_SAMPLE_EXP_MS))) {
struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
- int ref_cpu = cpu;
+ int ref_cpu;

if (!policy)
return -EINVAL;
@@ -265,11 +265,10 @@ int arch_freq_get_on_cpu(int cpu)
return -EOPNOTSUPP;
}

- do {
- ref_cpu = cpumask_next_wrap(ref_cpu, policy->cpus,
- start_cpu, true);
-
- } while (ref_cpu < nr_cpu_ids && idle_cpu(ref_cpu));
+ for_each_cpu_wrap(ref_cpu, policy->cpus, start_cpu) {
+ if (!idle_cpu(ref_cpu))
+ break;
+ }

cpufreq_cpu_put(policy);