Commit 5c84c1b8 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Clear real_cpus mask from remove_cpu_dev_symlink() 



add_cpu_dev_symlink() is responsible for setting the CPUs in the
real_cpus mask, the reverse of which should be done from
remove_cpu_dev_symlink() to make it look clean and avoid any breakage
later on.

Move the call to clear the mask to remove_cpu_dev_symlink().

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bbd67f1b

drivers/cpufreq/cpufreq.c

+4 −4
Original line number Diff line number Diff line
@@ -1020,11 +1020,12 @@ static void add_cpu_dev_symlink(struct cpufreq_policy *policy, unsigned int cpu, 
		dev_err(dev, "cpufreq symlink creation failed\n");

}



static void remove_cpu_dev_symlink(struct cpufreq_policy *policy,

static void remove_cpu_dev_symlink(struct cpufreq_policy *policy, int cpu,

				   struct device *dev)

{

	dev_dbg(dev, "%s: Removing symlink\n", __func__);

	sysfs_remove_link(&dev->kobj, "cpufreq");

	cpumask_clear_cpu(cpu, policy->real_cpus);

}



static int cpufreq_add_dev_interface(struct cpufreq_policy *policy)
@@ -1532,7 +1533,7 @@ static int cpufreq_online(unsigned int cpu) 


out_destroy_policy:

	for_each_cpu(j, policy->real_cpus)

		remove_cpu_dev_symlink(policy, get_cpu_device(j));

		remove_cpu_dev_symlink(policy, j, get_cpu_device(j));



	up_write(&policy->rwsem);
@@ -1657,8 +1658,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) 
	if (cpu_online(cpu))

		cpufreq_offline(cpu);



	cpumask_clear_cpu(cpu, policy->real_cpus);

	remove_cpu_dev_symlink(policy, dev);

	remove_cpu_dev_symlink(policy, cpu, dev);



	if (cpumask_empty(policy->real_cpus)) {

		/* We did light-weight exit earlier, do full tear down now */