Skip to content

Commit

Permalink
MIPS/Perf-events: Cleanup event->destroy at event init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Deng-Cheng Zhu authored and Ralf Baechle committed Dec 7, 2011
1 parent 266623b commit ff5d726
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions arch/mips/kernel/perf_event_mipsxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit ff5d726

Please sign in to comment.