Merge tag 'dmaengine-4.8-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[deliverable/linux.git] / drivers / cpufreq / cpufreq_ondemand.c

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 0c93cd9dee996f28fa5b080f2a89cb5ad2a6add3..3a1f49f5f4c68ae4d360e686773cafc2d49b8745 100644 (file)
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -85,11 +85,9 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy,
        freq_avg = freq_req - freq_reduc;
 
        /* Find freq bounds for freq_avg in freq_table */
-       index = cpufreq_frequency_table_target(policy, freq_avg,
-                                              CPUFREQ_RELATION_H);
+       index = cpufreq_table_find_index_h(policy, freq_avg);
        freq_lo = freq_table[index].frequency;
-       index = cpufreq_frequency_table_target(policy, freq_avg,
-                                              CPUFREQ_RELATION_L);
+       index = cpufreq_table_find_index_l(policy, freq_avg);
        freq_hi = freq_table[index].frequency;
 
        /* Find out how long we have to be in hi and lo freqs */