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().

Bug 1359622

Change-Id: I2057504a85cc773f98497285cf9e62e5a15c09ea
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>
(cherry picked from commit 934dac1ea072bd8adff8d6a6abba561731e093cf)
Reviewed-on: http://git-master/r/482371
Tested-by: Rajkumar Kasirajan <rkasirajan@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: Winnie Hsu <whsu@nvidia.com>

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 37db2446d948728a3f615b4e9d328a524ceed1b7..d0f1ceb4e979abc4d327bdaf251b442e0f8e6286 100644 (file)
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -68,8 +68,6 @@ static void cs_check_cpu(int cpu, unsigned int load)
                        return;
 
                dbs_info->requested_freq += get_freq_target(cs_tuners, policy);
-               if (dbs_info->requested_freq > policy->max)
-                       dbs_info->requested_freq = policy->max;
 
                __cpufreq_driver_target(policy, dbs_info->requested_freq,
                        CPUFREQ_RELATION_H);
@@ -92,8 +90,6 @@ static void cs_check_cpu(int cpu, unsigned int load)
                freq_target = get_freq_target(cs_tuners, policy);
                if (dbs_info->requested_freq > freq_target) {
                        dbs_info->requested_freq -= freq_target;
-                       if (dbs_info->requested_freq < policy->min)
-                               dbs_info->requested_freq = policy->min;
                } else
                        dbs_info->requested_freq = policy->min;
 

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 232de607a7a708b69d13720818a2f7664e227cdb..edaae6feacbd6877be0a43a27d6dae87091a4be0 100644 (file)
--- 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)
                /* No longer fully busy, reset rate_mult */
                dbs_info->rate_mult = 1;
 
-               if (freq_next < policy->min)
-                       freq_next = policy->min;
-
                if (!od_tuners->powersave_bias) {
                        __cpufreq_driver_target(policy, freq_next,
                                        CPUFREQ_RELATION_L);