cpufreq: intel_pstate: Consolidate policy verification

There is still some code duplication between intel_pstate_verify_policy()
and intel_cpufreq_verify_policy(), so avoid it by moving the common
code into a separate function and calling it from both these places.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index c81e1ff..404982d 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2155,15 +2155,19 @@ static void intel_pstate_adjust_policy_max(struct cpudata *cpu,
        }
 }
 
-static int intel_pstate_verify_policy(struct cpufreq_policy_data *policy)
+static void intel_pstate_verify_cpu_policy(struct cpudata *cpu,
+                                          struct cpufreq_policy_data *policy)
 {
-       struct cpudata *cpu = all_cpu_data[policy->cpu];
-
        update_turbo_state();
        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
                                     intel_pstate_get_max_freq(cpu));
 
        intel_pstate_adjust_policy_max(cpu, policy);
+}
+
+static int intel_pstate_verify_policy(struct cpufreq_policy_data *policy)
+{
+       intel_pstate_verify_cpu_policy(all_cpu_data[policy->cpu], policy);
 
        return 0;
 }
@@ -2268,12 +2272,7 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy_data *policy)
 {
        struct cpudata *cpu = all_cpu_data[policy->cpu];
 
-       update_turbo_state();
-       cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                    intel_pstate_get_max_freq(cpu));
-
-       intel_pstate_adjust_policy_max(cpu, policy);
-
+       intel_pstate_verify_cpu_policy(cpu, policy);
        intel_pstate_update_perf_limits(cpu, policy->min, policy->max);
 
        return 0;