]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
cpufreq: governor: Simplify cpufreq_governor_limits()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 7 Feb 2016 15:23:49 +0000 (16:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 9 Mar 2016 13:40:56 +0000 (14:40 +0100)
Use the observation that cpufreq_governor_limits() doesn't have to
get to the policy object it wants to manipulate by walking the
reference chain cdbs->policy_dbs->policy, as the final pointer is
actually equal to its argument, and make it access the policy
object directy via its argument.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
drivers/cpufreq/cpufreq_governor.c

index 431d81f7963c533da69382c4e24b440dd10c9342..ff247a7ac774215d1b3ff166aff2d0d6c0490d9b 100644 (file)
@@ -519,20 +519,19 @@ static int cpufreq_governor_limits(struct cpufreq_policy *policy)
 {
        struct dbs_governor *gov = dbs_governor_of(policy);
        struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(policy->cpu);
+       struct policy_dbs_info *policy_dbs = cdbs->policy_dbs;
 
        /* State should be equivalent to START */
-       if (!cdbs->policy_dbs || !cdbs->policy_dbs->policy)
+       if (!policy_dbs || !policy_dbs->policy)
                return -EBUSY;
 
-       mutex_lock(&cdbs->policy_dbs->timer_mutex);
-       if (policy->max < cdbs->policy_dbs->policy->cur)
-               __cpufreq_driver_target(cdbs->policy_dbs->policy, policy->max,
-                                       CPUFREQ_RELATION_H);
-       else if (policy->min > cdbs->policy_dbs->policy->cur)
-               __cpufreq_driver_target(cdbs->policy_dbs->policy, policy->min,
-                                       CPUFREQ_RELATION_L);
+       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);
        dbs_check_cpu(policy);
-       mutex_unlock(&cdbs->policy_dbs->timer_mutex);
+       mutex_unlock(&policy_dbs->timer_mutex);
 
        return 0;
 }