Commit d10b5eb5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent e40e7b25
...@@ -107,7 +107,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy) ...@@ -107,7 +107,7 @@ static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
struct dbs_data *dbs_data = policy->governor_data; struct dbs_data *dbs_data = policy->governor_data;
struct cs_dbs_tuners *cs_tuners = dbs_data->tuners; 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); return delay_for_sampling_rate(cs_tuners->sampling_rate);
} }
......
...@@ -31,8 +31,9 @@ static struct attribute_group *get_sysfs_attr(struct dbs_governor *gov) ...@@ -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; 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 dbs_governor *gov = dbs_governor_of(policy);
struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(cpu); struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(cpu);
struct dbs_data *dbs_data = policy->governor_data; struct dbs_data *dbs_data = policy->governor_data;
...@@ -517,8 +518,7 @@ static int cpufreq_governor_stop(struct cpufreq_policy *policy) ...@@ -517,8 +518,7 @@ static int cpufreq_governor_stop(struct cpufreq_policy *policy)
static int cpufreq_governor_limits(struct cpufreq_policy *policy) static int cpufreq_governor_limits(struct cpufreq_policy *policy)
{ {
struct dbs_governor *gov = dbs_governor_of(policy); struct dbs_governor *gov = dbs_governor_of(policy);
unsigned int cpu = policy->cpu; struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(policy->cpu);
struct cpu_dbs_info *cdbs = gov->get_cpu_cdbs(cpu);
/* State should be equivalent to START */ /* State should be equivalent to START */
if (!cdbs->policy_dbs || !cdbs->policy_dbs->policy) if (!cdbs->policy_dbs || !cdbs->policy_dbs->policy)
...@@ -531,7 +531,7 @@ static int cpufreq_governor_limits(struct cpufreq_policy *policy) ...@@ -531,7 +531,7 @@ static int cpufreq_governor_limits(struct cpufreq_policy *policy)
else if (policy->min > cdbs->policy_dbs->policy->cur) else if (policy->min > cdbs->policy_dbs->policy->cur)
__cpufreq_driver_target(cdbs->policy_dbs->policy, policy->min, __cpufreq_driver_target(cdbs->policy_dbs->policy, policy->min,
CPUFREQ_RELATION_L); CPUFREQ_RELATION_L);
dbs_check_cpu(policy, cpu); dbs_check_cpu(policy);
mutex_unlock(&cdbs->policy_dbs->timer_mutex); mutex_unlock(&cdbs->policy_dbs->timer_mutex);
return 0; return 0;
......
...@@ -279,7 +279,7 @@ static ssize_t show_sampling_rate_min_gov_pol \ ...@@ -279,7 +279,7 @@ static ssize_t show_sampling_rate_min_gov_pol \
extern struct mutex dbs_data_mutex; extern struct mutex dbs_data_mutex;
extern struct mutex cpufreq_governor_lock; 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); int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event);
void od_register_powersave_bias_handler(unsigned int (*f) void od_register_powersave_bias_handler(unsigned int (*f)
(struct cpufreq_policy *, unsigned int, unsigned int), (struct cpufreq_policy *, unsigned int, unsigned int),
......
...@@ -190,9 +190,7 @@ static void od_check_cpu(int cpu, unsigned int load) ...@@ -190,9 +190,7 @@ static void od_check_cpu(int cpu, unsigned int load)
static unsigned int od_dbs_timer(struct cpufreq_policy *policy) static unsigned int od_dbs_timer(struct cpufreq_policy *policy)
{ {
struct dbs_data *dbs_data = policy->governor_data; 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, policy->cpu);
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info,
cpu);
struct od_dbs_tuners *od_tuners = dbs_data->tuners; struct od_dbs_tuners *od_tuners = dbs_data->tuners;
int delay = 0, sample_type = dbs_info->sample_type; int delay = 0, sample_type = dbs_info->sample_type;
...@@ -203,7 +201,7 @@ static unsigned int od_dbs_timer(struct cpufreq_policy *policy) ...@@ -203,7 +201,7 @@ static unsigned int od_dbs_timer(struct cpufreq_policy *policy)
__cpufreq_driver_target(policy, dbs_info->freq_lo, __cpufreq_driver_target(policy, dbs_info->freq_lo,
CPUFREQ_RELATION_H); CPUFREQ_RELATION_H);
} else { } else {
dbs_check_cpu(policy, cpu); dbs_check_cpu(policy);
if (dbs_info->freq_lo) { if (dbs_info->freq_lo) {
/* Setup timer for SUB_SAMPLE */ /* Setup timer for SUB_SAMPLE */
dbs_info->sample_type = OD_SUB_SAMPLE; dbs_info->sample_type = OD_SUB_SAMPLE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment