diff options
| author | Deng-Cheng Zhu | 2011-11-21 20:28:48 +0100 |
|---|---|---|
| committer | Ralf Baechle | 2011-12-07 23:04:41 +0100 |
| commit | ff5d7265cfb88e8f8943a55afde90255fc5deacb (patch) | |
| tree | 0b93a78af8c04bc0cee71e641583d31a815d9245 /arch/mips | |
| parent | MIPS/Perf-events: Remove pmu and event state checking in validate_event() (diff) | |
| download | kernel-qcow2-linux-ff5d7265cfb88e8f8943a55afde90255fc5deacb.tar.gz kernel-qcow2-linux-ff5d7265cfb88e8f8943a55afde90255fc5deacb.tar.xz kernel-qcow2-linux-ff5d7265cfb88e8f8943a55afde90255fc5deacb.zip | |
MIPS/Perf-events: Cleanup event->destroy at event init
Simplify the code by changing the place of event->destroy().
Signed-off-by: Deng-Cheng Zhu <dczhu@mips.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: David Daney <david.daney@cavium.com>
Cc: Eyal Barzilay <eyal@mips.com>
Cc: Zenon Fortuna <zenon@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/3109/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/perf_event_mipsxx.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index b22cc5fd596d..bda4bc9e6988 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -633,11 +633,7 @@ static int mipspmu_event_init(struct perf_event *event) if (err) return err; - err = __hw_perf_event_init(event); - if (err) - hw_perf_event_destroy(event); - - return err; + return __hw_perf_event_init(event); } static struct pmu pmu = { @@ -1262,13 +1258,14 @@ static int __hw_perf_event_init(struct perf_event *event) } err = 0; - if (event->group_leader != event) { + if (event->group_leader != event) err = validate_group(event); - if (err) - return -EINVAL; - } event->destroy = hw_perf_event_destroy; + + if (err) + event->destroy(event); + return err; } |