cpufreq: governor: Rework cpufreq_governor_dbs()

Since it is possible to obtain a pointer to struct dbs_governor
from a pointer to the struct governor embedded in it via
container_of(), the second argument of cpufreq_governor_init()
is not necessary.  Accordingly, cpufreq_governor_dbs() doesn't
need its second argument either and the ->governor callbacks
for both the ondemand and conservative governors may be set
to cpufreq_governor_dbs() directly.  Make that happen.

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

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index c65ac365a2dd8425c13e84a5ed6045334ef5c74f..20c82913ef42d8c5c276f67cd164988b2ab9b7ea 100644 (file)
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -325,13 +325,10 @@ static void cs_exit(struct dbs_data *dbs_data, bool notify)
 
 define_get_cpu_dbs_routines(cs_cpu_dbs_info);
 
-static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,
-                                  unsigned int event);
-
 static struct dbs_governor cs_dbs_gov = {
        .gov = {
                .name = "conservative",
-               .governor = cs_cpufreq_governor_dbs,
+               .governor = cpufreq_governor_dbs,
                .max_transition_latency = TRANSITION_LATENCY_LIMIT,
                .owner = THIS_MODULE,
        },
@@ -348,12 +345,6 @@ static struct dbs_governor cs_dbs_gov = {
 
 #define CPU_FREQ_GOV_CONSERVATIVE      (&cs_dbs_gov.gov)
 
-static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,
-                                  unsigned int event)
-{
-       return cpufreq_governor_dbs(policy, &cs_dbs_gov, event);
-}
-
 static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
                                void *data)
 {

diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index dc5bb298b4498e72788e0ed7c036c66fb3db7f5b..7e579fc42d2a34e4a2f861bb9a56cddfaf1528db 100644 (file)
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -328,9 +328,10 @@ static void free_common_dbs_info(struct cpufreq_policy *policy,
        kfree(shared);
 }
 
-static int cpufreq_governor_init(struct cpufreq_policy *policy,
-                                struct dbs_governor *gov)
+static int cpufreq_governor_init(struct cpufreq_policy *policy)
 {
+       struct dbs_governor *gov = container_of(policy->governor,
+                                               struct dbs_governor, gov);
        struct dbs_data *dbs_data = gov->gdbs_data;
        unsigned int latency;
        int ret;
@@ -539,8 +540,7 @@ static int cpufreq_governor_limits(struct cpufreq_policy *policy)
        return 0;
 }
 
-int cpufreq_governor_dbs(struct cpufreq_policy *policy,
-                        struct dbs_governor *gov, unsigned int event)
+int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event)
 {
        int ret = -EINVAL;
 
@@ -548,7 +548,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
        mutex_lock(&dbs_data_mutex);
 
        if (event == CPUFREQ_GOV_POLICY_INIT) {
-               ret = cpufreq_governor_init(policy, gov);
+               ret = cpufreq_governor_init(policy);
        } else if (policy->governor_data) {
                switch (event) {
                case CPUFREQ_GOV_POLICY_EXIT:

diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index ed87b84429850a6b2cf55a7a6183f0973ec3f1b2..8e280b8c446a2533c53ebd4d74a8370122a98886 100644 (file)
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -276,8 +276,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 dbs_data *dbs_data, int cpu);
-int cpufreq_governor_dbs(struct cpufreq_policy *policy,
-               struct dbs_governor *gov, unsigned int event);
+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),
                unsigned int powersave_bias);

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index c38a4a1111d48e7040eef7fd5722296e9c4893e8..dcbcbf441ac15020f6653ccf2063a0670ef8218d 100644 (file)
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -539,13 +539,10 @@ static struct od_ops od_ops = {
        .freq_increase = dbs_freq_increase,
 };
 
-static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy,
-                                  unsigned int event);
-
 static struct dbs_governor od_dbs_gov = {
        .gov = {
                .name = "ondemand",
-               .governor = od_cpufreq_governor_dbs,
+               .governor = cpufreq_governor_dbs,
                .max_transition_latency = TRANSITION_LATENCY_LIMIT,
                .owner = THIS_MODULE,
        },
@@ -563,12 +560,6 @@ static struct dbs_governor od_dbs_gov = {
 
 #define CPU_FREQ_GOV_ONDEMAND  (&od_dbs_gov.gov)
 
-static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy,
-               unsigned int event)
-{
-       return cpufreq_governor_dbs(policy, &od_dbs_gov, event);
-}
-
 static void od_set_powersave_bias(unsigned int powersave_bias)
 {
        struct cpufreq_policy *policy;