From: Michael Ellerman <michael@ellerman.id.au>
Date: Fri, 28 Jun 2013 08:15:13 +0000 (+1000)
Subject: powerpc/perf: Use existing out label in power_pmu_enable()
X-Git-Tag: v3.11-rc1~94^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0a48843d6c5114cfa4a9540ee4d6af87628cec01;p=linux-block.git

powerpc/perf: Use existing out label in power_pmu_enable()

In power_pmu_enable() we can use the existing out label to reduce the
number of return paths.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
CC: <stable@vger.kernel.org> [v3.10]
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 517a1350b09c..1bb26d586e3c 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -919,12 +919,13 @@ static void power_pmu_enable(struct pmu *pmu)
 
 	if (!ppmu)
 		return;
+
 	local_irq_save(flags);
+
 	cpuhw = &__get_cpu_var(cpu_hw_events);
-	if (!cpuhw->disabled) {
-		local_irq_restore(flags);
-		return;
-	}
+	if (!cpuhw->disabled)
+		goto out;
+
 	cpuhw->disabled = 0;
 
 	/*