From 5798a05c5b038a96ab396576be4c7e157ab5baac Mon Sep 17 00:00:00 2001
From: Luis Gerhorst <privat@luisgerhorst.de>
Date: Tue, 7 Apr 2020 12:09:37 +0200
Subject: [PATCH] cpufreq: Fix rename of cppc_cpudata field perf_ctrls to ctrls
---
drivers/cpufreq/cppc_cpufreq.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index 81e9dff03c925..245c65aa9a547 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -199,15 +199,15 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
desired_perf = cppc_cpufreq_khz_to_perf(cpu, target_freq);
/* Return if it is exactly the same perf */
- if (desired_perf == cpu->perf_ctrls.desired_perf)
+ if (desired_perf == cpu->ctrls.desired_perf)
return ret;
- cpu->perf_ctrls.desired_perf = desired_perf;
+ cpu->ctrls.desired_perf = desired_perf;
freqs.old = policy->cur;
freqs.new = target_freq;
cpufreq_freq_transition_begin(policy, &freqs);
- ret = cppc_set_reg(cpu->cpu, &cpu->perf_ctrls, DESIRED_PERF);
+ ret = cppc_set_reg(cpu->cpu, &cpu->ctrls, DESIRED_PERF);
cpufreq_freq_transition_end(policy, &freqs, ret != 0);
if (ret)
@@ -229,9 +229,9 @@ static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
struct cppc_cpudata *cpu = all_cpu_data[cpu_num];
int ret;
- cpu->perf_ctrls.desired_perf = cpu->perf_caps.lowest_perf;
+ cpu->ctrls.desired_perf = cpu->perf_caps.lowest_perf;
- ret = cppc_set_reg(cpu_num, &cpu->perf_ctrls, DESIRED_PERF);
+ ret = cppc_set_reg(cpu_num, &cpu->ctrls, DESIRED_PERF);
if (ret)
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
cpu->perf_caps.lowest_perf, cpu_num, ret);
@@ -342,9 +342,9 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
/* Set policy->cur to max now. The governors will adjust later. */
policy->cur = cppc_cpufreq_perf_to_khz(cpu,
cpu->perf_caps.highest_perf);
- cpu->perf_ctrls.desired_perf = cpu->perf_caps.highest_perf;
+ cpu->ctrls.desired_perf = cpu->perf_caps.highest_perf;
- ret = cppc_set_reg(cpu_num, &cpu->perf_ctrls, DESIRED_PERF);
+ ret = cppc_set_reg(cpu_num, &cpu->ctrls, DESIRED_PERF);
if (ret)
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
cpu->perf_caps.highest_perf, cpu_num, ret);
@@ -379,7 +379,7 @@ static int cppc_get_rate_from_fbctrs(struct cppc_cpudata *cpu,
delivered_perf = (reference_perf * delta_delivered) /
delta_reference;
else
- delivered_perf = cpu->perf_ctrls.desired_perf;
+ delivered_perf = cpu->ctrls.desired_perf;
return cppc_cpufreq_perf_to_khz(cpu, delivered_perf);
}
--
GitLab