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

cpufreq: intel_pstate: Simplify intel_pstate_adjust_pstate()

Browse Source 
Since there is only one P-state selection routine in intel_pstate
now, make intel_pstate_adjust_pstate() call it directly and drop
the target_pstate argument from that function.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki
2017-08-10 01:08:56 +02:00
parent 3714c281c6
commit a891283e56
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/cpufreq/intel_pstate.c
View File

@@ -1495,13 +1495,15 @@ static void intel_pstate_update_pstate(struct cpudata *cpu, int pstate)
wrmsrl(MSR_IA32_PERF_CTL, pstate_funcs.get_val(cpu, pstate)); wrmsrl(MSR_IA32_PERF_CTL, pstate_funcs.get_val(cpu, pstate));
} }
static void intel_pstate_adjust_pstate(struct cpudata *cpu, int target_pstate) static void intel_pstate_adjust_pstate(struct cpudata *cpu)
{ {
int from = cpu->pstate.current_pstate; int from = cpu->pstate.current_pstate;
struct sample *sample; struct sample *sample;
int target_pstate;
update_turbo_state(); update_turbo_state();
target_pstate = get_target_pstate_use_cpu_load(cpu);
target_pstate = intel_pstate_prepare_request(cpu, target_pstate); target_pstate = intel_pstate_prepare_request(cpu, target_pstate);
trace_cpu_frequency(target_pstate * cpu->pstate.scaling, cpu->cpu); trace_cpu_frequency(target_pstate * cpu->pstate.scaling, cpu->cpu);
intel_pstate_update_pstate(cpu, target_pstate); intel_pstate_update_pstate(cpu, target_pstate);
@@ -1547,12 +1549,8 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time,
return; return;
set_pstate: set_pstate:
if (intel_pstate_sample(cpu, time)) { if (intel_pstate_sample(cpu, time))
int target_pstate; intel_pstate_adjust_pstate(cpu);
target_pstate = get_target_pstate_use_cpu_load(cpu);
intel_pstate_adjust_pstate(cpu, target_pstate);
}
} }
static struct pstate_funcs core_funcs = { static struct pstate_funcs core_funcs = {