From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753311AbbBRROg (ORCPT ); Wed, 18 Feb 2015 12:14:36 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39361 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751982AbbBRROd (ORCPT ); Wed, 18 Feb 2015 12:14:33 -0500 Date: Wed, 18 Feb 2015 09:13:39 -0800 From: tip-bot for Aravind Gopalakrishnan Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, paulus@samba.org, peterz@infradead.org, hpa@zytor.com, aravind.gopalakrishnan@amd.com, torvalds@linux-foundation.org, acme@kernel.org, mingo@kernel.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, paulus@samba.org, peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com, aravind.gopalakrishnan@amd.com, acme@kernel.org, mingo@kernel.org In-Reply-To: <1422037175-20957-1-git-send-email-aravind.gopalakrishnan@amd.com> References: <1422037175-20957-1-git-send-email-aravind.gopalakrishnan@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/amd/ibs: Convert force_ibs_eilvt_setup() to void Git-Commit-ID: c796b205b88c775fd220c1a63390bac6a8cdda3f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c796b205b88c775fd220c1a63390bac6a8cdda3f Gitweb: http://git.kernel.org/tip/c796b205b88c775fd220c1a63390bac6a8cdda3f Author: Aravind Gopalakrishnan AuthorDate: Fri, 23 Jan 2015 12:19:35 -0600 Committer: Ingo Molnar 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 Signed-off-by: Peter Zijlstra (Intel) Cc: Cc: Cc: Cc: Arnaldo Carvalho de Melo Cc: Linus Torvalds Link: http://lkml.kernel.org/r/1422037175-20957-1-git-send-email-aravind.gopalakrishnan@amd.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event_amd_ibs.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c index a61f5c6..989d3c2 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c @@ -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)