cpufreq: remove redundant 'governor' field from user_policy

[cascardo/linux.git] / drivers / cpufreq / cpufreq.c

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 8e71d8e..3033952 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