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

Commit dc84b2f2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: Check current frequency in device driver"

parents ed507ccb a0853dc1

drivers/cpufreq/cpufreq.c

+0 −9
Original line number Diff line number Diff line
@@ -1746,15 +1746,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
	pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n",

			policy->cpu, target_freq, relation, old_target_freq);



	/*

	 * This might look like a redundant call as we are checking it again

	 * after finding index. But it is left intentionally for cases where

	 * exactly same freq is called again and so we can save on few function

	 * calls.

	 */

	if (target_freq == policy->cur)

		return 0;



	if (cpufreq_driver->target)

		retval = cpufreq_driver->target(policy, target_freq, relation);

	else if (cpufreq_driver->target_index) {

drivers/cpufreq/qcom-cpufreq.c

+4 −1
Original line number Diff line number Diff line
@@ -73,12 +73,15 @@ static int msm_cpufreq_target(struct cpufreq_policy *policy, 
				unsigned int target_freq,

				unsigned int relation)

{

	int ret = -EFAULT;

	int ret = 0;

	int index;

	struct cpufreq_frequency_table *table;



	mutex_lock(&per_cpu(cpufreq_suspend, policy->cpu).suspend_mutex);



	if (target_freq == policy->cur)

		goto done;



	if (per_cpu(cpufreq_suspend, policy->cpu).device_suspended) {

		pr_debug("cpufreq: cpu%d scheduling frequency change "

				"in suspend.\n", policy->cpu);