cpufreq: remove redundant 'governor' field from user_policy

Its always same as policy->governor, and there is no need to keep
another copy of it. Remove it.

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

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 8e71d8e084397b7792ff3c5f8c7dad071dd055bf..3033952391fe3c07a6e06771eef1fea7f573b506 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -675,7 +675,6 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
                return ret;
 
        policy->user_policy.policy = policy->policy;
-       policy->user_policy.governor = policy->governor;
        return count;
 }
 
@@ -1323,10 +1322,9 @@ static int cpufreq_online(unsigned int cpu)
                goto out_exit_policy;
        }
 
-       if (new_policy) {
+       if (new_policy)
                policy->user_policy.policy = policy->policy;
-               policy->user_policy.governor = policy->governor;
-       }
+
        up_write(&policy->rwsem);
 
        kobject_uevent(&policy->kobj, KOBJ_ADD);
@@ -2305,7 +2303,6 @@ int cpufreq_update_policy(unsigned int cpu)
        new_policy.min = policy->user_policy.min;
        new_policy.max = policy->user_policy.max;
        new_policy.policy = policy->user_policy.policy;
-       new_policy.governor = policy->user_policy.governor;
 
        /*
         * BIOS might change freq behind our back

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index bedcc90c0757f7c425ddba6e96142d980bc0d305..752bf8a5c3146b30bd27a3db31fc6d939b517fd4 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -55,7 +55,6 @@ struct cpufreq_real_policy {
        unsigned int            min;    /* in kHz */
        unsigned int            max;    /* in kHz */
        unsigned int            policy; /* see above */
-       struct cpufreq_governor *governor; /* see below */
 };
 
 struct cpufreq_policy {