Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1343564

[PATCH 1/2] cpufreq: Rearrange __cpufreq_driver_target()

Show all headers | View raw

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/cpufreq/cpufreq.c |   47 ++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

Index: linux-pm/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq.c
+++ linux-pm/drivers/cpufreq/cpufreq.c
@@ -1899,7 +1899,8 @@ int __cpufreq_driver_target(struct cpufr
 			    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;
@@ -1926,34 +1927,28 @@ int __cpufreq_driver_target(struct cpufr
 	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;
-
-		freq_table = cpufreq_frequency_get_table(policy->cpu);
-		if (unlikely(!freq_table)) {
-			pr_err("%s: Unable to find freq_table\n", __func__);
-			goto out;
-		}
-
-		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 cpufreq_driver->target(policy, target_freq, relation);
 
-		retval = __target_index(policy, freq_table, index);
+	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__);
+		return -EINVAL;
+	}
+
+	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__);
+		return retval;
 	}
 
-out:
-	return retval;
+	if (freq_table[index].frequency == policy->cur)
+		return 0;
+
+	return __target_index(policy, freq_table, index);
 }
 EXPORT_SYMBOL_GPL(__cpufreq_driver_target);
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] cpufreq cleanups related to pointless labels "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-02-26 00:10 +0100
  [PATCH 2/2] cpufreq: acpi-cpufreq: Drop pointless label from acpi_cpufreq_target() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-02-26 00:10 +0100
    Re: [PATCH 2/2] cpufreq: acpi-cpufreq: Drop pointless label from  acpi_cpufreq_target() Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> - 2016-02-26 00:50 +0100
  [PATCH 1/2] cpufreq: Rearrange __cpufreq_driver_target() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-02-26 00:10 +0100
  Re: [PATCH 0/2] cpufreq cleanups related to pointless labels Viresh Kumar <viresh.kumar@linaro.org> - 2016-02-26 03:40 +0100

csiph-web