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>
-static int reserve_ds_buffers(void);
+static void reserve_ds_buffers(void);
static void release_ds_buffers(void);
static void hw_perf_event_destroy(struct perf_event *event)
static void release_ds_buffers(void);
static void hw_perf_event_destroy(struct perf_event *event)
if (atomic_read(&active_events) == 0) {
if (!reserve_pmc_hardware())
err = -EBUSY;
if (atomic_read(&active_events) == 0) {
if (!reserve_pmc_hardware())
err = -EBUSY;
- else {
- err = reserve_ds_buffers();
- if (err)
- release_pmc_hardware();
- }
+ else
+ reserve_ds_buffers();
}
if (!err)
atomic_inc(&active_events);
}
if (!err)
atomic_inc(&active_events);
-static int reserve_ds_buffers(void)
+static void reserve_ds_buffers(void)
{
int bts_err = 0, pebs_err = 0;
int cpu;
{
int bts_err = 0, pebs_err = 0;
int cpu;
x86_pmu.pebs_active = 0;
if (!x86_pmu.bts && !x86_pmu.pebs)
x86_pmu.pebs_active = 0;
if (!x86_pmu.bts && !x86_pmu.pebs)
if (!x86_pmu.bts)
bts_err = 1;
if (!x86_pmu.bts)
bts_err = 1;
#else /* CONFIG_CPU_SUP_INTEL */
#else /* CONFIG_CPU_SUP_INTEL */
-static int reserve_ds_buffers(void)
+static void reserve_ds_buffers(void)
}
static void release_ds_buffers(void)
}
static void release_ds_buffers(void)