cpufreq: Remove 'policy->governor_enabled'

The entire sequence of events (like INIT/START or STOP/EXIT) for which
cpufreq_governor() is called, is guaranteed to be protected by
policy->rwsem now.

The additional checks that were added earlier (as we were forced to drop
policy->rwsem before calling cpufreq_governor() for EXIT event), aren't
required anymore.

Over that, they weren't sufficient really. They just take care of
START/STOP events, but not INIT/EXIT and the state machine was never
maintained properly by them.

Kill the unnecessary checks and policy->governor_enabled field.

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

1 files changed, 0 insertions, 17 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index b3d05a905034..dd568aaf2728 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2010,17 +2010,6 @@ static int cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
 
         pr_debug("%s: for CPU %u, event %u\n", __func__, policy->cpu, event);
 
-        if ((policy->governor_enabled && event == CPUFREQ_GOV_START)
-            || (!policy->governor_enabled
-            && (event == CPUFREQ_GOV_LIMITS || event == CPUFREQ_GOV_STOP))) {
-                return -EBUSY;
-        }
-
-        if (event == CPUFREQ_GOV_STOP)
-                policy->governor_enabled = false;
-        else if (event == CPUFREQ_GOV_START)
-                policy->governor_enabled = true;
-
         ret = policy->governor->governor(policy, event);
 
         if (!ret) {
@@ -2028,12 +2017,6 @@ static int cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
                         policy->governor->initialized++;
                 else if (event == CPUFREQ_GOV_POLICY_EXIT)
                         policy->governor->initialized--;
-        } else {
-                /* Restore original values */
-                if (event == CPUFREQ_GOV_STOP)
-                        policy->governor_enabled = true;
-                else if (event == CPUFREQ_GOV_START)
-                        policy->governor_enabled = false;
         }
 
         if (((event == CPUFREQ_GOV_POLICY_INIT) && ret) ||