p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf/x86/amd/ibs: Convert force_ibs_eilvt_setup() to void 

The caller of force_ibs_eilvt_setup() is ibs_eilvt_setup()
which does not care about the return values.

So mark it void and clean up the return statements.

Signed-off-by: Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <hpa@zytor.com>
Cc: <paulus@samba.org>
Cc: <tglx@linutronix.de>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1422037175-20957-1-git-send-email-aravind.gopalakrishnan@amd.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Aravind Gopalakrishnan 2015-01-23 12:19:35 -06:00 committed by Ingo Molnar
parent 6a694a607a
commit c796b205b8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/kernel/cpu/perf_event_amd_ibs.c
View File

@ -796,7 +796,7 @@ static int setup_ibs_ctl(int ibs_eilvt_off)
* the IBS interrupt vector is handled by perf_ibs_cpu_notifier that * the IBS interrupt vector is handled by perf_ibs_cpu_notifier that
* is using the new offset. * is using the new offset.
*/ */
static int force_ibs_eilvt_setup(void) static void force_ibs_eilvt_setup(void)
{ {
int offset; int offset;
int ret; int ret;
@ -811,26 +811,24 @@ static int force_ibs_eilvt_setup(void)
if (offset == APIC_EILVT_NR_MAX) { if (offset == APIC_EILVT_NR_MAX) {
printk(KERN_DEBUG "No EILVT entry available\n"); printk(KERN_DEBUG "No EILVT entry available\n");
return -EBUSY; return;
} }
ret = setup_ibs_ctl(offset); ret = setup_ibs_ctl(offset);
if (ret) if (ret)
goto out; goto out;
if (!ibs_eilvt_valid()) { if (!ibs_eilvt_valid())
ret = -EFAULT;
goto out; goto out;
}
pr_info("IBS: LVT offset %d assigned\n", offset); pr_info("IBS: LVT offset %d assigned\n", offset);
return 0; return;
out: out:
preempt_disable(); preempt_disable();
put_eilvt(offset); put_eilvt(offset);
preempt_enable(); preempt_enable();
return ret; return;
} }
static void ibs_eilvt_setup(void) static void ibs_eilvt_setup(void)