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 f3d3df2..6853634 100644 (file)
--- 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;
 }