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


Groups > linux.kernel > #1343562

[PATCH 2/2] cpufreq: acpi-cpufreq: Drop pointless label from acpi_cpufreq_target()

From "Rafael J. Wysocki" <rjw@rjwysocki.net>
Newsgroups linux.kernel
Subject [PATCH 2/2] cpufreq: acpi-cpufreq: Drop pointless label from acpi_cpufreq_target()
Date 2016-02-26 00:10 +0100
Message-ID <r6dcJ-2Ch-3@gated-at.bofh.it> (permalink)
References <r6dcJ-2Ch-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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

The "out" label at the final return statement in acpi_cpufreq_target()
is totally pointless, so drop them and modify the code to return the
right values immediately instead of jumping to it.

No functional changes.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/cpufreq/acpi-cpufreq.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Index: linux-pm/drivers/cpufreq/acpi-cpufreq.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/acpi-cpufreq.c
+++ linux-pm/drivers/cpufreq/acpi-cpufreq.c
@@ -434,7 +434,7 @@ static int acpi_cpufreq_target(struct cp
 		} else {
 			pr_debug("Already at target state (P%d)\n",
 				next_perf_state);
-			goto out;
+			return 0;
 		}
 	}
 
@@ -456,8 +456,7 @@ static int acpi_cpufreq_target(struct cp
 		cmd.val = (u32) perf->states[next_perf_state].control;
 		break;
 	default:
-		result = -ENODEV;
-		goto out;
+		return -ENODEV;
 	}
 
 	/* cpufreq holds the hotplug lock, so we are safe from here on */
@@ -480,7 +479,6 @@ static int acpi_cpufreq_target(struct cp
 	if (!result)
 		perf->state = next_perf_state;
 
-out:
 	return result;
 }
 

Back to linux.kernel | Previous | NextPrevious 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