cpufreq: governor: Drop cpu argument from dbs_check_cpu()

Since policy->cpu is always passed as the second argument to
dbs_check_cpu(), it is not really necessary to pass it, because
the function can obtain that value via its first argument just fine.

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

4 files changed, 8 insertions, 10 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index b2df5de6cf92..b8054e53a37e 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -107,7 +107,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
         struct dbs_data *dbs_data = policy->governor_data;
         struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
 
-        dbs_check_cpu(policy, policy->cpu);
+        dbs_check_cpu(policy);
         return delay_for_sampling_rate(cs_tuners->sampling_rate);
 }
 
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index b425cd3da682..431d81f7963c 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -31,8 +31,9 @@ static struct attribute_group *get_sysfs_attr(struct dbs_governor *gov)
                 gov->attr_group_gov_pol : gov->attr_group_gov_sys;
 }
 
-void dbs_check_cpu(struct cpufreq_policy *policy, int cpu)
+void dbs_check_cpu(struct cpufreq_policy *policy)
 {
+        int cpu = policy->cpu;
         struct dbs_governor *gov = dbs_governor_of(policy);
         struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(cpu);
         struct dbs_data *dbs_data = policy->governor_data;
@@ -517,8 +518,7 @@ static int cpufreq_governor_stop(struct cpufreq_policy *policy)
 static int cpufreq_governor_limits(struct cpufreq_policy *policy)
 {
         struct dbs_governor *gov = dbs_governor_of(policy);
-        unsigned int cpu = policy->cpu;
-        struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(cpu);
+        struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(policy->cpu);
 
         /* State should be equivalent to START */
         if (!cdbs->policy_dbs || !cdbs->policy_dbs->policy)
@@ -531,7 +531,7 @@ static int cpufreq_governor_limits(struct cpufreq_policy *policy)
         else if (policy->min > cdbs->policy_dbs->policy->cur)
                 __cpufreq_driver_target(cdbs->policy_dbs->policy, policy->min,
                                         CPUFREQ_RELATION_L);
-        dbs_check_cpu(policy, cpu);
+        dbs_check_cpu(policy);
         mutex_unlock(&cdbs->policy_dbs->timer_mutex);
 
         return 0;
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index c90a2d3766fd..63868d7f14f5 100644
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -279,7 +279,7 @@ static ssize_t show_sampling_rate_min_gov_pol				\
 
 extern struct mutex dbs_data_mutex;
 extern struct mutex cpufreq_governor_lock;
-void dbs_check_cpu(struct cpufreq_policy *policy, int cpu);
+void dbs_check_cpu(struct cpufreq_policy *policy);
 int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event);
 void od_register_powersave_bias_handler(unsigned int (*f)
                 (struct cpufreq_policy *, unsigned int, unsigned int),
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 4a2332733cca..9ef4402644c7 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -190,9 +190,7 @@ static void od_check_cpu(int cpu, unsigned int load)
 static unsigned int od_dbs_timer(struct cpufreq_policy *policy)
 {
         struct dbs_data *dbs_data = policy->governor_data;
-        unsigned int cpu = policy->cpu;
-        struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info,
-                        cpu);
+        struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, policy->cpu);
         struct od_dbs_tuners *od_tuners = dbs_data->tuners;
         int delay = 0, sample_type = dbs_info->sample_type;
 
@@ -203,7 +201,7 @@ static unsigned int od_dbs_timer(struct cpufreq_policy *policy)
                 __cpufreq_driver_target(policy, dbs_info->freq_lo,
                                         CPUFREQ_RELATION_H);
         } else {
-                dbs_check_cpu(policy, cpu);
+                dbs_check_cpu(policy);
                 if (dbs_info->freq_lo) {
                         /* Setup timer for SUB_SAMPLE */
                         dbs_info->sample_type = OD_SUB_SAMPLE;