summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-08-27 14:32:41 +0200
committerRobert Richter <robert.richter@amd.com>2010-10-11 19:34:03 +0200
commit9c91283a19c2d998a83f50f113f8585709c15caf (patch)
tree77a0af19cf77eca6c3068f76f5de286f7df7bb0d /drivers
parentMerge branch 'oprofile/core' (early part) into oprofile/perf (diff)
downloadlinux-9c91283a19c2d998a83f50f113f8585709c15caf.tar.xz
linux-9c91283a19c2d998a83f50f113f8585709c15caf.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/oprofile/oprofile_perf.c6
1 files changed, 2 insertions, 4 deletions
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;
}