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

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

cpufreq: Drop 'freq_table' argument of __target_index() 



It is already present as part of the policy and so no need to pass it
from the caller. Also, 'freq_table' is guaranteed to be valid in this
function and so no need to check it.

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

drivers/cpufreq/cpufreq.c

+7 −14
Original line number Diff line number Diff line
@@ -1852,14 +1852,17 @@ static int __target_intermediate(struct cpufreq_policy *policy, 
	return ret;

}



static int __target_index(struct cpufreq_policy *policy,

			  struct cpufreq_frequency_table *freq_table, int index)

static int __target_index(struct cpufreq_policy *policy, int index)

{

	struct cpufreq_freqs freqs = {.old = policy->cur, .flags = 0};

	unsigned int intermediate_freq = 0;

	unsigned int newfreq = policy->freq_table[index].frequency;

	int retval = -EINVAL;

	bool notify;



	if (newfreq == policy->cur)

		return 0;



	notify = !(cpufreq_driver->flags & CPUFREQ_ASYNC_NOTIFICATION);

	if (notify) {

		/* Handle switching to intermediate frequency */
@@ -1874,7 +1877,7 @@ static int __target_index(struct cpufreq_policy *policy, 
				freqs.old = freqs.new;

		}



		freqs.new = freq_table[index].frequency;

		freqs.new = newfreq;

		pr_debug("%s: cpu: %d, oldfreq: %u, new freq: %u\n",

			 __func__, policy->cpu, freqs.old, freqs.new);
@@ -1911,7 +1914,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
			    unsigned int relation)

{

	unsigned int old_target_freq = target_freq;

	struct cpufreq_frequency_table *freq_table;

	int index, retval;



	if (cpufreq_disabled())
@@ -1941,12 +1943,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
	if (!cpufreq_driver->target_index)

		return -EINVAL;



	freq_table = policy->freq_table;

	if (unlikely(!freq_table)) {

		pr_err("%s: Unable to find freq_table\n", __func__);

		return -EINVAL;

	}



	retval = cpufreq_frequency_table_target(policy, target_freq, relation,

						&index);

	if (unlikely(retval)) {
@@ -1954,10 +1950,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
		return retval;

	}



	if (freq_table[index].frequency == policy->cur)

		return 0;



	return __target_index(policy, freq_table, index);

	return __target_index(policy, index);

}

EXPORT_SYMBOL_GPL(__cpufreq_driver_target);