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

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

cpufreq: add new routine cpufreq_verify_within_cpu_limits() 



Most of the users of cpufreq_verify_within_limits() calls it for
limiting with min/max from policy->cpuinfo. We can make that code
simple by introducing another routine which will do this for them
automatically.

This patch adds another routine cpufreq_verify_within_cpu_limits()
and updates others to use it.

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

drivers/cpufreq/cpufreq-nforce2.c

+1 −3
Original line number Diff line number Diff line
@@ -303,9 +303,7 @@ static int nforce2_verify(struct cpufreq_policy *policy) 
	if (policy->min < (fsb_pol_max * fid * 100))

		policy->max = (fsb_pol_max + 1) * fid * 100;



	cpufreq_verify_within_limits(policy,

				     policy->cpuinfo.min_freq,

				     policy->cpuinfo.max_freq);

	cpufreq_verify_within_cpu_limits(policy);

	return 0;

}

drivers/cpufreq/davinci-cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ static int davinci_verify_speed(struct cpufreq_policy *policy) 
	if (policy->cpu)

		return -EINVAL;



	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

				     policy->cpuinfo.max_freq);



	cpufreq_verify_within_cpu_limits(policy);

	policy->min = clk_round_rate(armclk, policy->min * 1000) / 1000;

	policy->max = clk_round_rate(armclk, policy->max * 1000) / 1000;

	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

drivers/cpufreq/freq_table.c

+2 −4
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, 
	pr_debug("request for verification of policy (%u - %u kHz) for cpu %u\n",

					policy->min, policy->max, policy->cpu);



	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

				     policy->cpuinfo.max_freq);

	cpufreq_verify_within_cpu_limits(policy);



	for (; freq = table[i].frequency, freq != CPUFREQ_TABLE_END; i++) {

		if (freq == CPUFREQ_ENTRY_INVALID)
@@ -77,8 +76,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy, 


	if (!found) {

		policy->max = next_larger;

		cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

				policy->cpuinfo.max_freq);

		cpufreq_verify_within_cpu_limits(policy);

	}



	pr_debug("verification lead to (%u - %u kHz) for cpu %u\n",

drivers/cpufreq/integrator-cpufreq.c

+2 −7
Original line number Diff line number Diff line
@@ -59,9 +59,7 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) 
{

	struct icst_vco vco;



	cpufreq_verify_within_limits(policy, 

				     policy->cpuinfo.min_freq, 

				     policy->cpuinfo.max_freq);

	cpufreq_verify_within_cpu_limits(policy);



	vco = icst_hz_to_vco(&cclk_params, policy->max * 1000);

	policy->max = icst_hz(&cclk_params, vco) / 1000;
@@ -69,10 +67,7 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) 
	vco = icst_hz_to_vco(&cclk_params, policy->min * 1000);

	policy->min = icst_hz(&cclk_params, vco) / 1000;



	cpufreq_verify_within_limits(policy, 

				     policy->cpuinfo.min_freq, 

				     policy->cpuinfo.max_freq);



	cpufreq_verify_within_cpu_limits(policy);

	return 0;

}

drivers/cpufreq/intel_pstate.c

+1 −3
Original line number Diff line number Diff line
@@ -611,9 +611,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 


static int intel_pstate_verify_policy(struct cpufreq_policy *policy)

{

	cpufreq_verify_within_limits(policy,

				policy->cpuinfo.min_freq,

				policy->cpuinfo.max_freq);

	cpufreq_verify_within_cpu_limits(policy);



	if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) &&

		(policy->policy != CPUFREQ_POLICY_PERFORMANCE))