]> git.karo-electronics.de Git - linux-beck.git/commitdiff
cpufreq: Remove unused HOTPLUG_CPU code
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 7 Feb 2013 05:26:03 +0000 (10:56 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 9 Feb 2013 00:21:37 +0000 (01:21 +0100)
Because the sibling cpu of any online cpu is identified very early in
cpufreq_add_dev(), below code is never executed. And so can be removed.

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

index cd7644554a628485f2e2fffdd3dd9a5b97d74172..41d72c3aa2b26c5a86cf82b9d460571a6fbdc893 100644 (file)
@@ -852,7 +852,7 @@ static int cpufreq_add_policy_cpu(unsigned int cpu, unsigned int sibling,
 static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
 {
        unsigned int j, cpu = dev->id;
-       int ret = -ENOMEM, found = 0;
+       int ret = -ENOMEM;
        struct cpufreq_policy *policy;
        unsigned long flags;
 #ifdef CONFIG_HOTPLUG_CPU
@@ -900,6 +900,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
                goto err_free_cpumask;
 
        policy->cpu = cpu;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        cpumask_copy(policy->cpus, cpumask_of(cpu));
 
        /* Initially set CPU itself as the policy_cpu */
@@ -910,20 +911,6 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
        init_completion(&policy->kobj_unregister);
        INIT_WORK(&policy->update, handle_update);
 
-       /* Set governor before ->init, so that driver could check it */
-#ifdef CONFIG_HOTPLUG_CPU
-       for_each_online_cpu(sibling) {
-               struct cpufreq_policy *cp = per_cpu(cpufreq_cpu_data, sibling);
-               if (cp && cp->governor &&
-                   (cpumask_test_cpu(cpu, cp->related_cpus))) {
-                       policy->governor = cp->governor;
-                       found = 1;
-                       break;
-               }
-       }
-#endif
-       if (!found)
-               policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        /* call driver. From then on the cpufreq must be able
         * to accept all calls to ->verify and ->setpolicy for this CPU
         */