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

Commit 6019d23a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: Rearrange __cpufreq_driver_target() 



Drop a pointless label at a return statement from
__cpufreq_driver_target() and rearrange that function
to reduce the indentation level.

No intentional functional changes.

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

drivers/cpufreq/cpufreq.c

+19 −24
Original line number Diff line number Diff line
@@ -1805,7 +1805,8 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
			    unsigned int relation)

{

	unsigned int old_target_freq = target_freq;

	int retval = -EINVAL;

	struct cpufreq_frequency_table *freq_table;

	int index, retval;



	if (cpufreq_disabled())

		return -ENODEV;
@@ -1832,34 +1833,28 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
	policy->restore_freq = policy->cur;



	if (cpufreq_driver->target)

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

	else if (cpufreq_driver->target_index) {

		struct cpufreq_frequency_table *freq_table;

		int index;

		return cpufreq_driver->target(policy, target_freq, relation);



	if (!cpufreq_driver->target_index)

		return -EINVAL;



	freq_table = cpufreq_frequency_get_table(policy->cpu);

	if (unlikely(!freq_table)) {

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

			goto out;

		return -EINVAL;

	}



		retval = cpufreq_frequency_table_target(policy, freq_table,

				target_freq, relation, &index);

	retval = cpufreq_frequency_table_target(policy, freq_table, target_freq,

						relation, &index);

	if (unlikely(retval)) {

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

			goto out;

		}



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

			retval = 0;

			goto out;

		return retval;

	}



		retval = __target_index(policy, freq_table, index);

	}

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

		return 0;



out:

	return retval;

	return __target_index(policy, freq_table, index);

}

EXPORT_SYMBOL_GPL(__cpufreq_driver_target);