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

Commit 999f5729 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: Introduce cpufreq_update_current_freq() 



Move the part of cpufreq_update_policy() that obtains the current
frequency from the driver and updates policy->cur if necessary to
a separate function, cpufreq_get_current_freq().

That should not introduce functional changes and subsequent change
set will need it.

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

drivers/cpufreq/cpufreq.c

+19 −9
Original line number Diff line number Diff line
@@ -1487,6 +1487,24 @@ unsigned int cpufreq_get(unsigned int cpu) 
}

EXPORT_SYMBOL(cpufreq_get);



static unsigned int cpufreq_update_current_freq(struct cpufreq_policy *policy)

{

	unsigned int new_freq;



	new_freq = cpufreq_driver->get(policy->cpu);

	if (!new_freq)

		return 0;



	if (!policy->cur) {

		pr_debug("cpufreq: Driver did not initialize current freq\n");

		policy->cur = new_freq;

	} else if (policy->cur != new_freq && has_target()) {

		cpufreq_out_of_sync(policy, new_freq);

	}



	return new_freq;

}



static struct subsys_interface cpufreq_interface = {

	.name		= "cpufreq",

	.subsys		= &cpu_subsys,
@@ -2152,19 +2170,11 @@ int cpufreq_update_policy(unsigned int cpu) 
	 * -> ask driver for current freq and notify governors about a change

	 */

	if (cpufreq_driver->get && !cpufreq_driver->setpolicy) {

		new_policy.cur = cpufreq_driver->get(cpu);

		new_policy.cur = cpufreq_update_current_freq(policy);

		if (WARN_ON(!new_policy.cur)) {

			ret = -EIO;

			goto unlock;

		}



		if (!policy->cur) {

			pr_debug("Driver did not initialize current freq\n");

			policy->cur = new_policy.cur;

		} else {

			if (policy->cur != new_policy.cur && has_target())

				cpufreq_out_of_sync(policy, new_policy.cur);

		}

	}



	ret = cpufreq_set_policy(policy, &new_policy);