diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-10-19 08:50:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-22 08:18:26 -0400 |
commit | f80c9e304b8e8062230b0cda2c2fdd586149c771 (patch) | |
tree | 5f6ec4a103e49744f822ed43f6a0090b38c13354 /arch/x86/kernel/cpu | |
parent | 6809b6ea73f7291f2e495d40397f1172c9caa77e (diff) |
perf, x86: Clean up reserve_ds_buffers() signature
Now that reserve_ds_buffers() never fails, change it to return
void and remove all code dealing with the error return.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Stephane Eranian <eranian@google.com>
LKML-Reference: <20101019134808.462621937@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 9 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_ds.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 61e78f65106..a333bf9189f 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -382,7 +382,7 @@ static void release_pmc_hardware(void) {} | |||
382 | 382 | ||
383 | #endif | 383 | #endif |
384 | 384 | ||
385 | static int reserve_ds_buffers(void); | 385 | static void reserve_ds_buffers(void); |
386 | static void release_ds_buffers(void); | 386 | static void release_ds_buffers(void); |
387 | 387 | ||
388 | static void hw_perf_event_destroy(struct perf_event *event) | 388 | static void hw_perf_event_destroy(struct perf_event *event) |
@@ -546,11 +546,8 @@ static int __x86_pmu_event_init(struct perf_event *event) | |||
546 | if (atomic_read(&active_events) == 0) { | 546 | if (atomic_read(&active_events) == 0) { |
547 | if (!reserve_pmc_hardware()) | 547 | if (!reserve_pmc_hardware()) |
548 | err = -EBUSY; | 548 | err = -EBUSY; |
549 | else { | 549 | else |
550 | err = reserve_ds_buffers(); | 550 | reserve_ds_buffers(); |
551 | if (err) | ||
552 | release_pmc_hardware(); | ||
553 | } | ||
554 | } | 551 | } |
555 | if (!err) | 552 | if (!err) |
556 | atomic_inc(&active_events); | 553 | atomic_inc(&active_events); |
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c index 05c7db68277..8a7f81cbd61 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c | |||
@@ -191,7 +191,7 @@ static void release_ds_buffers(void) | |||
191 | put_online_cpus(); | 191 | put_online_cpus(); |
192 | } | 192 | } |
193 | 193 | ||
194 | static int reserve_ds_buffers(void) | 194 | static void reserve_ds_buffers(void) |
195 | { | 195 | { |
196 | int bts_err = 0, pebs_err = 0; | 196 | int bts_err = 0, pebs_err = 0; |
197 | int cpu; | 197 | int cpu; |
@@ -200,7 +200,7 @@ static int reserve_ds_buffers(void) | |||
200 | x86_pmu.pebs_active = 0; | 200 | x86_pmu.pebs_active = 0; |
201 | 201 | ||
202 | if (!x86_pmu.bts && !x86_pmu.pebs) | 202 | if (!x86_pmu.bts && !x86_pmu.pebs) |
203 | return 0; | 203 | return; |
204 | 204 | ||
205 | if (!x86_pmu.bts) | 205 | if (!x86_pmu.bts) |
206 | bts_err = 1; | 206 | bts_err = 1; |
@@ -251,8 +251,6 @@ static int reserve_ds_buffers(void) | |||
251 | } | 251 | } |
252 | 252 | ||
253 | put_online_cpus(); | 253 | put_online_cpus(); |
254 | |||
255 | return 0; | ||
256 | } | 254 | } |
257 | 255 | ||
258 | /* | 256 | /* |
@@ -714,9 +712,8 @@ static void intel_ds_init(void) | |||
714 | 712 | ||
715 | #else /* CONFIG_CPU_SUP_INTEL */ | 713 | #else /* CONFIG_CPU_SUP_INTEL */ |
716 | 714 | ||
717 | static int reserve_ds_buffers(void) | 715 | static void reserve_ds_buffers(void) |
718 | { | 716 | { |
719 | return 0; | ||
720 | } | 717 | } |
721 | 718 | ||
722 | static void release_ds_buffers(void) | 719 | static void release_ds_buffers(void) |