Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14bef1ad authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman
Browse files

cpufreq: Split cpufreq_offline() 



[ Upstream commit fddd8f86dff4a24742a7f0322ccbb34c6c1c9850 ]

Split the "core" part running under the policy rwsem out of
cpufreq_offline() to allow the locking in cpufreq_remove_dev() to be
rearranged more easily.

As a side-effect this eliminates the unlock label that's not needed
any more.

No expected functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Stable-dep-of: b8f85833c057 ("cpufreq: exit() callback is optional")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 458965e8

drivers/cpufreq/cpufreq.c

+19 −14
Original line number Diff line number Diff line
@@ -1553,21 +1553,10 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) 
	return 0;

}



static int cpufreq_offline(unsigned int cpu)

static void __cpufreq_offline(unsigned int cpu, struct cpufreq_policy *policy)

{

	struct cpufreq_policy *policy;

	int ret;



	pr_debug("%s: unregistering CPU %u\n", __func__, cpu);



	policy = cpufreq_cpu_get_raw(cpu);

	if (!policy) {

		pr_debug("%s: No cpu_data found\n", __func__);

		return 0;

	}



	down_write(&policy->rwsem);



	if (has_target())

		cpufreq_stop_governor(policy);
@@ -1585,7 +1574,7 @@ static int cpufreq_offline(unsigned int cpu) 
				pr_err("%s: Failed to start governor\n", __func__);

		}



		goto unlock;

		return;

	}



	if (has_target())
@@ -1615,8 +1604,24 @@ static int cpufreq_offline(unsigned int cpu) 
		cpufreq_driver->exit(policy);

		policy->freq_table = NULL;

	}

}



static int cpufreq_offline(unsigned int cpu)

{

	struct cpufreq_policy *policy;



	pr_debug("%s: unregistering CPU %u\n", __func__, cpu);



	policy = cpufreq_cpu_get_raw(cpu);

	if (!policy) {

		pr_debug("%s: No cpu_data found\n", __func__);

		return 0;

	}



	down_write(&policy->rwsem);



	__cpufreq_offline(cpu, policy);



unlock:

	up_write(&policy->rwsem);

	return 0;

}