From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbcBYXCz (ORCPT ); Thu, 25 Feb 2016 18:02:55 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:64580 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751963AbcBYXCa (ORCPT ); Thu, 25 Feb 2016 18:02:30 -0500 From: "Rafael J. Wysocki" To: Linux PM list Cc: Linux Kernel Mailing List , Srinivas Pandruvada , Viresh Kumar Subject: [PATCH 2/2] cpufreq: acpi-cpufreq: Drop pointless label from acpi_cpufreq_target() Date: Fri, 26 Feb 2016 00:03:58 +0100 Message-ID: <1905248.5bkSJ3vszA@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.5.0-rc1+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <3419119.Zd6aAZrh1K@vostro.rjw.lan> References: <3419119.Zd6aAZrh1K@vostro.rjw.lan> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki 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 --- 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; }