forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oprofile, ARM: Rework op_create_counter()

Browse source 
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>
This commit is contained in:
Robert Richter 2010-09-29 14:43:29 +02:00
commit 2bcb2b641a
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/oprofile/oprofile_perf.c
View file

@ -71,28 +71,28 @@ static void op_perf_setup(void)
static int op_create_counter(int cpu, int event) static int op_create_counter(int cpu, int event)
{ {
int ret = 0;
struct perf_event *pevent; struct perf_event *pevent;
if (!counter_config[event].enabled || (perf_events[cpu][event] != NULL)) if (!counter_config[event].enabled || perf_events[cpu][event])
return ret; return 0;
pevent = perf_event_create_kernel_counter(&counter_config[event].attr, pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
cpu, -1, cpu, -1,
op_overflow_handler); op_overflow_handler);
if (IS_ERR(pevent)) { if (IS_ERR(pevent))
ret = PTR_ERR(pevent); return PTR_ERR(pevent);
} else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
perf_event_release_kernel(pevent); perf_event_release_kernel(pevent);
pr_warning("oprofile: failed to enable event %d " pr_warning("oprofile: failed to enable event %d "
"on CPU %d\n", event, cpu); "on CPU %d\n", event, cpu);
ret = -EBUSY; return -EBUSY;
} else {
perf_events[cpu][event] = pevent;
} }
return ret; perf_events[cpu][event] = pevent;
return 0;
} }
static void op_destroy_counter(int cpu, int event) static void op_destroy_counter(int cpu, int event)