cpufreq: governor: Create cpufreq_policy_apply_limits()

Create a new helper to avoid code duplication across governors.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 18eab7f4ba4c69ac73bf8a72121cede6f8a74730..4b88b5bec4ef6fc4c3df1abe8c85a150ab943ea4 100644 (file)
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -553,12 +553,7 @@ void cpufreq_dbs_governor_limits(struct cpufreq_policy *policy)
        struct policy_dbs_info *policy_dbs = policy->governor_data;
 
        mutex_lock(&policy_dbs->timer_mutex);
-
-       if (policy->max < policy->cur)
-               __cpufreq_driver_target(policy, policy->max, CPUFREQ_RELATION_H);
-       else if (policy->min > policy->cur)
-               __cpufreq_driver_target(policy, policy->min, CPUFREQ_RELATION_L);
-
+       cpufreq_policy_apply_limits(policy);
        gov_update_sample_delay(policy_dbs, 0);
 
        mutex_unlock(&policy_dbs->timer_mutex);

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 5bcda3e6aa9efed9a1185e2f5443d91ac336e09a..3be54a0b43732c7c5a8c50d05ca39563f0e5f260 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -489,6 +489,14 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor);
 struct cpufreq_governor *cpufreq_default_governor(void);
 struct cpufreq_governor *cpufreq_fallback_governor(void);
 
+static inline void cpufreq_policy_apply_limits(struct cpufreq_policy *policy)
+{
+       if (policy->max < policy->cur)
+               __cpufreq_driver_target(policy, policy->max, CPUFREQ_RELATION_H);
+       else if (policy->min > policy->cur)
+               __cpufreq_driver_target(policy, policy->min, CPUFREQ_RELATION_L);
+}
+
 /* Governor attribute set */
 struct gov_attr_set {
        struct kobject kobj;

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index fdcee3cf38fcc601ffee3676ea400c59e6af7d60..758efd7f3abe9d2a28eb7340fad5af3b3767df86 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -463,14 +463,7 @@ static void sugov_limits(struct cpufreq_policy *policy)
 
        if (!policy->fast_switch_enabled) {
                mutex_lock(&sg_policy->work_lock);
-
-               if (policy->max < policy->cur)
-                       __cpufreq_driver_target(policy, policy->max,
-                                               CPUFREQ_RELATION_H);
-               else if (policy->min > policy->cur)
-                       __cpufreq_driver_target(policy, policy->min,
-                                               CPUFREQ_RELATION_L);
-
+               cpufreq_policy_apply_limits(policy);
                mutex_unlock(&sg_policy->work_lock);
        }