perf/x86/amd/ibs: Convert force_ibs_eilvt_setup to void
Subsystems (2)
PATCH 1/1 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, marking it void and cleaning up the return statements.
Signed-off-by Aravind Gopalakrishnan <[email protected]>
--- arch/x86/kernel/cpu/perf_event_amd_ibs.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/perf_event_amd_ibs.c +5 -7
@@ -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 * is using the new offset. */ -static int force_ibs_eilvt_setup (void ) +static void force_ibs_eilvt_setup (void ) {int offset;int ret;
@@ -811,26 +811,24 @@ static int force_ibs_eilvt_setup(void)if (offset ==APIC_EILVT_NR_MAX ) {printk (KERN_DEBUG "No EILVT entry available\n" ); -return -EBUSY ; +return ; } ret =setup_ibs_ctl (offset);if (ret) goto out; -if (!ibs_eilvt_valid ()) { - ret = -EFAULT ; +if (!ibs_eilvt_valid ()) goto out; - }pr_info ("IBS: LVT offset %d assigned\n" , offset); -return 0 ; +return ; out:preempt_disable ();put_eilvt (offset);preempt_enable (); -return ret; +return ; }static void ibs_eilvt_setup (void )
Signature · 1 line
2.1.0
tip-bot for Aravind Gopalakrishnan
merge bot[tip:perf/core] perf/x86/amd/ibs: Convert force_ibs_eilvt_setup() to void
perf/x86/amd/ibs: Convert force_ibs_eilvt_setup() to void
Commit-ID: c796b205b88c775fd220c1a63390bac6a8cdda3f Gitweb: http://git.kernel.org/tip/c796b205b88c775fd220c1a63390bac6a8cdda3f Author: Aravind Gopalakrishnan <[email protected]> AuthorDate: Fri, 23 Jan 2015 12:19:35 -0600 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 18 Feb 2015 17:01:46 +0100
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 <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Cc <[email protected]>
Cc <[email protected]>
Cc <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Linus Torvalds <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event_amd_ibs.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/perf_event_amd_ibs.c +5 -7
@@ -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 * is using the new offset. */ -static int force_ibs_eilvt_setup (void ) +static void force_ibs_eilvt_setup (void ) {int offset;int ret;
@@ -811,26 +811,24 @@ static int force_ibs_eilvt_setup(void)if (offset ==APIC_EILVT_NR_MAX ) {printk (KERN_DEBUG "No EILVT entry available\n" ); -return -EBUSY ; +return ; } ret =setup_ibs_ctl (offset);if (ret) goto out; -if (!ibs_eilvt_valid ()) { - ret = -EFAULT ; +if (!ibs_eilvt_valid ()) goto out; - }pr_info ("IBS: LVT offset %d assigned\n" , offset); -return 0 ; +return ; out:preempt_disable ();put_eilvt (offset);preempt_enable (); -return ret; +return ; }static void ibs_eilvt_setup (void )