diff options
author | Stratos Karafotis <stratosk@semaphore.gr> | 2013-08-26 14:37:28 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-28 16:03:02 -0400 |
commit | 934dac1ea072bd8adff8d6a6abba561731e093cf (patch) | |
tree | ee7b24fe58e60f1bd04c250f0d278d32115ee320 /drivers/cpufreq | |
parent | 3617f2ca6d0eba48114308532945a7f1577816a4 (diff) |
cpufreq: governors: Remove duplicate check of target freq in supported range
Function __cpufreq_driver_target() checks if target_freq is within
policy->min and policy->max range. generic_powersave_bias_target() also
checks if target_freq is valid via a cpufreq_frequency_table_target()
call. So, drop the unnecessary duplicate check in *_check_cpu().
Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 4 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq_ondemand.c | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 7f67a75b3c3c..f62d822048e6 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c | |||
@@ -67,8 +67,6 @@ static void cs_check_cpu(int cpu, unsigned int load) | |||
67 | return; | 67 | return; |
68 | 68 | ||
69 | dbs_info->requested_freq += get_freq_target(cs_tuners, policy); | 69 | dbs_info->requested_freq += get_freq_target(cs_tuners, policy); |
70 | if (dbs_info->requested_freq > policy->max) | ||
71 | dbs_info->requested_freq = policy->max; | ||
72 | 70 | ||
73 | __cpufreq_driver_target(policy, dbs_info->requested_freq, | 71 | __cpufreq_driver_target(policy, dbs_info->requested_freq, |
74 | CPUFREQ_RELATION_H); | 72 | CPUFREQ_RELATION_H); |
@@ -89,8 +87,6 @@ static void cs_check_cpu(int cpu, unsigned int load) | |||
89 | return; | 87 | return; |
90 | 88 | ||
91 | dbs_info->requested_freq -= get_freq_target(cs_tuners, policy); | 89 | dbs_info->requested_freq -= get_freq_target(cs_tuners, policy); |
92 | if (dbs_info->requested_freq < policy->min) | ||
93 | dbs_info->requested_freq = policy->min; | ||
94 | 90 | ||
95 | __cpufreq_driver_target(policy, dbs_info->requested_freq, | 91 | __cpufreq_driver_target(policy, dbs_info->requested_freq, |
96 | CPUFREQ_RELATION_L); | 92 | CPUFREQ_RELATION_L); |
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 87f3305e80a6..32f26f6e17c5 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c | |||
@@ -177,9 +177,6 @@ static void od_check_cpu(int cpu, unsigned int load) | |||
177 | /* No longer fully busy, reset rate_mult */ | 177 | /* No longer fully busy, reset rate_mult */ |
178 | dbs_info->rate_mult = 1; | 178 | dbs_info->rate_mult = 1; |
179 | 179 | ||
180 | if (freq_next < policy->min) | ||
181 | freq_next = policy->min; | ||
182 | |||
183 | if (!od_tuners->powersave_bias) { | 180 | if (!od_tuners->powersave_bias) { |
184 | __cpufreq_driver_target(policy, freq_next, | 181 | __cpufreq_driver_target(policy, freq_next, |
185 | CPUFREQ_RELATION_L); | 182 | CPUFREQ_RELATION_L); |