Merge branch 'pm-cpufreq'

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

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index ca96333..6633b3f 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1445,13 +1445,13 @@ static void cpufreq_offline_finish(unsigned int cpu)
  *
  * Removes the cpufreq interface for a CPU device.
  */
-static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
+static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
 {
        unsigned int cpu = dev->id;
        struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
 
        if (!policy)
-               return 0;
+               return;
 
        if (cpu_online(cpu)) {
                cpufreq_offline_prepare(cpu);
@@ -1462,7 +1462,7 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
 
        if (cpumask_empty(policy->real_cpus)) {
                cpufreq_policy_free(policy, true);
-               return 0;
+               return;
        }
 
        if (cpu != policy->kobj_cpu) {
@@ -1481,8 +1481,6 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
                policy->kobj_cpu = new_cpu;
                WARN_ON(kobject_move(&policy->kobj, &new_dev->kobj));
        }
-
-       return 0;
 }
 
 static void handle_update(struct work_struct *work)