diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-14 00:33:17 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-14 00:33:17 +0300 |
| commit | bb4b9933e2bc0554cf4db37aa07b19ff69a85f8f (patch) | |
| tree | 92ec230e0292874d6a53ff33534e8637fa315479 /drivers/cpufreq/amd_freq_sensitivity.c | |
| parent | 5edb56491d4812c42175980759da53388e5d86f5 (diff) | |
| parent | f6709b8aa78fb6765c443ad6b70fdaf48b89d95d (diff) | |
| download | linux-bb4b9933e2bc0554cf4db37aa07b19ff69a85f8f.tar.xz | |
Merge back earlier cpufreq changes for v4.8.
Diffstat (limited to 'drivers/cpufreq/amd_freq_sensitivity.c')
| -rw-r--r-- | drivers/cpufreq/amd_freq_sensitivity.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c index 404360cad25c..6d5dc04c3a37 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c @@ -48,9 +48,8 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy, struct policy_dbs_info *policy_dbs = policy->governor_data; struct dbs_data *od_data = policy_dbs->dbs_data; struct od_dbs_tuners *od_tuners = od_data->tuners; - struct od_policy_dbs_info *od_info = to_dbs_info(policy_dbs); - if (!od_info->freq_table) + if (!policy->freq_table) return freq_next; rdmsr_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, @@ -92,10 +91,9 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy, else { unsigned int index; - cpufreq_frequency_table_target(policy, - od_info->freq_table, policy->cur - 1, - CPUFREQ_RELATION_H, &index); - freq_next = od_info->freq_table[index].frequency; + index = cpufreq_frequency_table_target(policy, + policy->cur - 1, CPUFREQ_RELATION_H); + freq_next = policy->freq_table[index].frequency; } data->freq_prev = freq_next; |