From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbcFNL2N (ORCPT ); Tue, 14 Jun 2016 07:28:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34040 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153AbcFNL2L (ORCPT ); Tue, 14 Jun 2016 07:28:11 -0400 Date: Tue, 14 Jun 2016 04:27:29 -0700 From: tip-bot for Bjorn Helgaas Message-ID: Cc: mingo@kernel.org, acme@redhat.com, kan.liang@intel.com, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, bp@suse.de, tglx@linutronix.de, alexander.shishkin@linux.intel.com, eranian@google.com, jolsa@redhat.com, bhelgaas@google.com, peterz@infradead.org Reply-To: hpa@zytor.com, tglx@linutronix.de, bp@suse.de, peterz@infradead.org, bhelgaas@google.com, eranian@google.com, jolsa@redhat.com, alexander.shishkin@linux.intel.com, acme@redhat.com, kan.liang@intel.com, mingo@kernel.org, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <20160531212527.28718.92371.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20160531212527.28718.92371.stgit@bhelgaas-glaptop2.roam.corp.google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/uncore: Remove redundant pci_get_drvdata() Git-Commit-ID: 281ee056e3f27d925350d65e5eb504b1320d7d5a 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: 281ee056e3f27d925350d65e5eb504b1320d7d5a Gitweb: http://git.kernel.org/tip/281ee056e3f27d925350d65e5eb504b1320d7d5a Author: Bjorn Helgaas AuthorDate: Tue, 31 May 2016 16:25:27 -0500 Committer: Ingo Molnar CommitDate: Tue, 14 Jun 2016 11:16:51 +0200 perf/x86/intel/uncore: Remove redundant pci_get_drvdata() Remove redundant pci_get_drvdata() call. There's another call a few lines down, just before we test "box" for NULL. No functional change intended. Signed-off-by: Bjorn Helgaas Signed-off-by: Peter Zijlstra (Intel) Acked-by: Thomas Gleixner Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: H. Peter Anvin Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Vince Weaver Link: http://lkml.kernel.org/r/20160531212527.28718.92371.stgit@bhelgaas-glaptop2.roam.corp.google.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 4e70d27..dc965d2 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -974,7 +974,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id static void uncore_pci_remove(struct pci_dev *pdev) { - struct intel_uncore_box *box = pci_get_drvdata(pdev); + struct intel_uncore_box *box; struct intel_uncore_pmu *pmu; int i, phys_id, pkg;