leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpufreq: intel_pstate: Combine ->stop_cpu() and ->offline()

Browse Source 
Combine the ->stop_cpu() and ->offline() callback routines for
intel_pstate in the active mode so as to avoid setting the
->stop_cpu callback pointer which is going to be dropped from
the framework.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Rafael J. Wysocki
2021-06-30 18:44:46 +02:00
parent 3563f55ce6
commit 49d6feef94
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/cpufreq/intel_pstate.c
View File

@@ -2532,7 +2532,7 @@ static int intel_pstate_verify_policy(struct cpufreq_policy_data *policy)
return 0; return 0;
} }
static int intel_pstate_cpu_offline(struct cpufreq_policy *policy) static int intel_cpufreq_cpu_offline(struct cpufreq_policy *policy)
{ {
struct cpudata *cpu = all_cpu_data[policy->cpu]; struct cpudata *cpu = all_cpu_data[policy->cpu];
@@ -2577,11 +2577,11 @@ static int intel_pstate_cpu_online(struct cpufreq_policy *policy)
return 0; return 0;
} }
static void intel_pstate_stop_cpu(struct cpufreq_policy *policy) static int intel_pstate_cpu_offline(struct cpufreq_policy *policy)
{ {
pr_debug("CPU %d stopping\n", policy->cpu);
intel_pstate_clear_update_util_hook(policy->cpu); intel_pstate_clear_update_util_hook(policy->cpu);
return intel_cpufreq_cpu_offline(policy);
} }
static int intel_pstate_cpu_exit(struct cpufreq_policy *policy) static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
@@ -2654,7 +2654,6 @@ static struct cpufreq_driver intel_pstate = {
.resume = intel_pstate_resume, .resume = intel_pstate_resume,
.init = intel_pstate_cpu_init, .init = intel_pstate_cpu_init,
.exit = intel_pstate_cpu_exit, .exit = intel_pstate_cpu_exit,
.stop_cpu = intel_pstate_stop_cpu,
.offline = intel_pstate_cpu_offline, .offline = intel_pstate_cpu_offline,
.online = intel_pstate_cpu_online, .online = intel_pstate_cpu_online,
.update_limits = intel_pstate_update_limits, .update_limits = intel_pstate_update_limits,
@@ -2956,7 +2955,7 @@ static struct cpufreq_driver intel_cpufreq = {
.fast_switch = intel_cpufreq_fast_switch, .fast_switch = intel_cpufreq_fast_switch,
.init = intel_cpufreq_cpu_init, .init = intel_cpufreq_cpu_init,
.exit = intel_cpufreq_cpu_exit, .exit = intel_cpufreq_cpu_exit,
.offline = intel_pstate_cpu_offline, .offline = intel_cpufreq_cpu_offline,
.online = intel_pstate_cpu_online, .online = intel_pstate_cpu_online,
.suspend = intel_pstate_suspend, .suspend = intel_pstate_suspend,
.resume = intel_pstate_resume, .resume = intel_pstate_resume,