cpufreq: Reuse new freq-table helpers

This patch migrates few users of cpufreq tables to the new helpers
that work on sorted freq-tables.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Viresh Kumar 2016-06-27 09:59:34 +05:30 committed by Rafael J. Wysocki
parent da0c6dc00c
commit 825773609c
5 changed files with 10 additions and 20 deletions

View File

@ -468,20 +468,14 @@ unsigned int acpi_cpufreq_fast_switch(struct cpufreq_policy *policy,
struct acpi_cpufreq_data *data = policy->driver_data; struct acpi_cpufreq_data *data = policy->driver_data;
struct acpi_processor_performance *perf; struct acpi_processor_performance *perf;
struct cpufreq_frequency_table *entry; struct cpufreq_frequency_table *entry;
unsigned int next_perf_state, next_freq, freq; unsigned int next_perf_state, next_freq, index;
/* /*
* Find the closest frequency above target_freq. * Find the closest frequency above target_freq.
*
* The table is sorted in the reverse order with respect to the
* frequency and all of the entries are valid (see the initialization).
*/ */
entry = policy->freq_table; index = cpufreq_table_find_index_dl(policy, target_freq);
do {
entry++; entry = &policy->freq_table[index];
freq = entry->frequency;
} while (freq >= target_freq && freq != CPUFREQ_TABLE_END);
entry--;
next_freq = entry->frequency; next_freq = entry->frequency;
next_perf_state = entry->driver_data; next_perf_state = entry->driver_data;

View File

@ -91,8 +91,8 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy,
else { else {
unsigned int index; unsigned int index;
index = cpufreq_frequency_table_target(policy, index = cpufreq_table_find_index_h(policy,
policy->cur - 1, CPUFREQ_RELATION_H); policy->cur - 1);
freq_next = policy->freq_table[index].frequency; freq_next = policy->freq_table[index].frequency;
} }

View File

@ -85,11 +85,9 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy,
freq_avg = freq_req - freq_reduc; freq_avg = freq_req - freq_reduc;
/* Find freq bounds for freq_avg in freq_table */ /* Find freq bounds for freq_avg in freq_table */
index = cpufreq_frequency_table_target(policy, freq_avg, index = cpufreq_table_find_index_h(policy, freq_avg);
CPUFREQ_RELATION_H);
freq_lo = freq_table[index].frequency; freq_lo = freq_table[index].frequency;
index = cpufreq_frequency_table_target(policy, freq_avg, index = cpufreq_table_find_index_l(policy, freq_avg);
CPUFREQ_RELATION_L);
freq_hi = freq_table[index].frequency; freq_hi = freq_table[index].frequency;
/* Find out how long we have to be in hi and lo freqs */ /* Find out how long we have to be in hi and lo freqs */

View File

@ -760,8 +760,7 @@ void powernv_cpufreq_work_fn(struct work_struct *work)
struct cpufreq_policy policy; struct cpufreq_policy policy;
cpufreq_get_policy(&policy, cpu); cpufreq_get_policy(&policy, cpu);
index = cpufreq_frequency_table_target(&policy, policy.cur, index = cpufreq_table_find_index_c(&policy, policy.cur);
CPUFREQ_RELATION_C);
powernv_cpufreq_target_index(&policy, index); powernv_cpufreq_target_index(&policy, index);
cpumask_andnot(&mask, &mask, policy.cpus); cpumask_andnot(&mask, &mask, policy.cpus);
} }

View File

@ -246,8 +246,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, unsigned int index)
new_freq = s5pv210_freq_table[index].frequency; new_freq = s5pv210_freq_table[index].frequency;
/* Finding current running level index */ /* Finding current running level index */
priv_index = cpufreq_frequency_table_target(policy, old_freq, priv_index = cpufreq_table_find_index_h(policy, old_freq);
CPUFREQ_RELATION_H);
arm_volt = dvs_conf[index].arm_volt; arm_volt = dvs_conf[index].arm_volt;
int_volt = dvs_conf[index].int_volt; int_volt = dvs_conf[index].int_volt;