cpufreq: intel_pstate: Avoid redundant initialization of local vars

After commit 1a4fe38add8b ("cpufreq: intel_pstate: Remove max/min
fractions to limit performance") the initial value of the pstate local
variable in intel_pstate_max_within_limits() and the initial value of
the max_pstate local variable in intel_pstate_prepare_request() are
both immediately discarded, so initialize both these variables to
their target values upfront.

No intentional changes of behavior.

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 75a5408e69815d248509922e692b38aacbb61854..3a4d15a48c1f489aeb836d5a519392a0555879ab 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1471,11 +1471,9 @@ static void intel_pstate_set_min_pstate(struct cpudata *cpu)
 
 static void intel_pstate_max_within_limits(struct cpudata *cpu)
 {
-       int pstate;
+       int pstate = max(cpu->pstate.min_pstate, cpu->max_perf_ratio);
 
        update_turbo_state();
-       pstate = intel_pstate_get_base_pstate(cpu);
-       pstate = max(cpu->pstate.min_pstate, cpu->max_perf_ratio);
        intel_pstate_set_pstate(cpu, pstate);
 }
 
@@ -1716,11 +1714,9 @@ static inline int32_t get_target_pstate(struct cpudata *cpu)
 
 static int intel_pstate_prepare_request(struct cpudata *cpu, int pstate)
 {
-       int max_pstate = intel_pstate_get_base_pstate(cpu);
-       int min_pstate;
+       int min_pstate = max(cpu->pstate.min_pstate, cpu->min_perf_ratio);
+       int max_pstate = max(min_pstate, cpu->max_perf_ratio);
 
-       min_pstate = max(cpu->pstate.min_pstate, cpu->min_perf_ratio);
-       max_pstate = max(min_pstate, cpu->max_perf_ratio);
        return clamp_t(int, pstate, min_pstate, max_pstate);
 }