cpufreq: governor: Rearrange governor data structures

The struct policy_dbs_info objects representing per-policy governor
data are not accessible directly from the corresponding policy
objects.  To access them, one has to get a pointer to the
struct cpu_dbs_info of policy->cpu and use the policy_dbs field of
that which isn't really straightforward.

To address that rearrange the governor data structures so the
governor_data pointer in struct cpufreq_policy will point to
struct policy_dbs_info (instead of struct dbs_data) and that will
contain a pointer to struct dbs_data.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index b8054e53a37e..1a899bb7d1a4 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -48,7 +48,8 @@ static void cs_check_cpu(int cpu, unsigned int load)
 {
         struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, cpu);
         struct cpufreq_policy *policy = dbs_info->cdbs.policy_dbs->policy;
-        struct dbs_data *dbs_data = policy->governor_data;
+        struct policy_dbs_info *policy_dbs = policy->governor_data;
+        struct dbs_data *dbs_data = policy_dbs->dbs_data;
         struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
 
         /*
@@ -104,7 +105,8 @@ static void cs_check_cpu(int cpu, unsigned int load)
 
 static unsigned int cs_dbs_timer(struct cpufreq_policy *policy)
 {
-        struct dbs_data *dbs_data = policy->governor_data;
+        struct policy_dbs_info *policy_dbs = policy->governor_data;
+        struct dbs_data *dbs_data = policy_dbs->dbs_data;
         struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
 
         dbs_check_cpu(policy);