From: Robert Richter <robert.richter@amd.com>
Date: Fri, 27 Aug 2010 12:32:41 +0000 (+0200)
Subject: oprofile, ARM: Remove some goto statements
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c91283a19c2d998a83f50f113f8585709c15caf;p=linux-beck.git

oprofile, ARM: Remove some goto statements

This patch removes some unnecessary goto statements.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
---

diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index f3d3df229a43..6853634c4681 100644
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -117,11 +117,10 @@ static int op_perf_start(void)
 		for (event = 0; event < num_counters; ++event) {
 			ret = op_create_counter(cpu, event);
 			if (ret)
-				goto out;
+				return ret;
 		}
 	}
 
-out:
 	return ret;
 }
 
@@ -224,7 +223,7 @@ static int __init init_driverfs(void)
 
 	ret = platform_driver_register(&oprofile_driver);
 	if (ret)
-		goto out;
+		return ret;
 
 	oprofile_pdev =	platform_device_register_simple(
 				oprofile_driver.driver.name, 0, NULL, 0);
@@ -233,7 +232,6 @@ static int __init init_driverfs(void)
 		platform_driver_unregister(&oprofile_driver);
 	}
 
-out:
 	return ret;
 }