From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753288AbbE0KGE (ORCPT ); Wed, 27 May 2015 06:06:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33469 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753116AbbE0KEn (ORCPT ); Wed, 27 May 2015 06:04:43 -0400 Date: Wed, 27 May 2015 03:04:08 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: torvalds@linux-foundation.org, kanaka.d.juvva@intel.com, linux-kernel@vger.kernel.org, vikas.shivappa@linux.intel.com, matt.fleming@intel.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, will.auld@intel.com Reply-To: peterz@infradead.org, hpa@zytor.com, will.auld@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, matt.fleming@intel.com, tglx@linutronix.de, vikas.shivappa@linux.intel.com, torvalds@linux-foundation.org, kanaka.d.juvva@intel.com In-Reply-To: <20150518235150.159779847@linutronix.de> References: <20150518235150.159779847@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/cqm: Remove useless wrapper function Git-Commit-ID: 43d0c2f6dcd07ffc0de658a7fbeeb63c806e9caa 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: 43d0c2f6dcd07ffc0de658a7fbeeb63c806e9caa Gitweb: http://git.kernel.org/tip/43d0c2f6dcd07ffc0de658a7fbeeb63c806e9caa Author: Thomas Gleixner AuthorDate: Tue, 19 May 2015 00:00:56 +0000 Committer: Ingo Molnar CommitDate: Wed, 27 May 2015 09:17:40 +0200 perf/x86/intel/cqm: Remove useless wrapper function intel_cqm_event_del() is a 1:1 wrapper for intel_cqm_event_stop(). Remove the useless indirection. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Matt Fleming Cc: Kanaka Juvva Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Vikas Shivappa Cc: Will Auld Link: http://lkml.kernel.org/r/20150518235150.159779847@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event_intel_cqm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c index 2ce69c0..8241b64 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c +++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c @@ -1033,11 +1033,6 @@ static int intel_cqm_event_add(struct perf_event *event, int mode) return 0; } -static void intel_cqm_event_del(struct perf_event *event, int mode) -{ - intel_cqm_event_stop(event, mode); -} - static void intel_cqm_event_destroy(struct perf_event *event) { struct perf_event *group_other = NULL; @@ -1230,7 +1225,7 @@ static struct pmu intel_cqm_pmu = { .task_ctx_nr = perf_sw_context, .event_init = intel_cqm_event_init, .add = intel_cqm_event_add, - .del = intel_cqm_event_del, + .del = intel_cqm_event_stop, .start = intel_cqm_event_start, .stop = intel_cqm_event_stop, .read = intel_cqm_event_read,