diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-09-29 14:43:29 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-04 10:54:33 +0200 |
| commit | f6be4b428197766521aca664a935c63888d096d9 (patch) | |
| tree | 8199590cd58ad6f445864b04480404b98cfc8d57 | |
| parent | 4d1814f48edec31f12737609cd1c871864c8298b (diff) | |
oprofile, ARM: Rework op_create_counter()
This patch simplifies op_create_counter(). Removing if/else if paths
and return code variable by direct returning from function.
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
| -rw-r--r-- | arch/arm/oprofile/common.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index 7ae9eebe7efc..cec9305c1cce 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c @@ -89,28 +89,28 @@ static void op_perf_setup(void) static int op_create_counter(int cpu, int event) { - int ret = 0; struct perf_event *pevent; - if (!counter_config[event].enabled || (perf_events[cpu][event] != NULL)) - return ret; + if (!counter_config[event].enabled || perf_events[cpu][event]) + return 0; pevent = perf_event_create_kernel_counter(&counter_config[event].attr, cpu, -1, op_overflow_handler); - if (IS_ERR(pevent)) { - ret = PTR_ERR(pevent); - } else if (pevent->state != PERF_EVENT_STATE_ACTIVE) { + if (IS_ERR(pevent)) + return PTR_ERR(pevent); + + if (pevent->state != PERF_EVENT_STATE_ACTIVE) { perf_event_release_kernel(pevent); pr_warning("oprofile: failed to enable event %d " "on CPU %d\n", event, cpu); - ret = -EBUSY; - } else { - perf_events[cpu][event] = pevent; + return -EBUSY; } - return ret; + perf_events[cpu][event] = pevent; + + return 0; } static void op_destroy_counter(int cpu, int event) |