From: Rafael J. Wysocki <[email protected]>

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 <[email protected]>
---
 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;
 }
 

Reply via email to