From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888AbdF1UsH (ORCPT ); Wed, 28 Jun 2017 16:48:07 -0400 Received: from terminus.zytor.com ([65.50.211.136]:46231 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751817AbdF1UsG (ORCPT ); Wed, 28 Jun 2017 16:48:06 -0400 Date: Wed, 28 Jun 2017 13:43:23 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: bp@alien8.de, ak@linux.intel.com, hpa@zytor.com, helgaas@kernel.org, linux-kernel@vger.kernel.org, eranian@google.com, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org Reply-To: tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, linux-kernel@vger.kernel.org, eranian@google.com, helgaas@kernel.org, ak@linux.intel.com, bp@alien8.de In-Reply-To: <20170316215056.967808646@linutronix.de> References: <20170316215056.967808646@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/PCI: Remove duplicate defines Git-Commit-ID: 9304d1621e6019c63497f8a4aad09d003916dbe9 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: 9304d1621e6019c63497f8a4aad09d003916dbe9 Gitweb: http://git.kernel.org/tip/9304d1621e6019c63497f8a4aad09d003916dbe9 Author: Thomas Gleixner AuthorDate: Thu, 16 Mar 2017 22:50:03 +0100 Committer: Thomas Gleixner CommitDate: Wed, 28 Jun 2017 22:32:55 +0200 x86/PCI: Remove duplicate defines For some historic reason these defines are duplicated and also available in arch/x86/include/asm/pci_x86.h, Remove them. Signed-off-by: Thomas Gleixner Acked-by: Bjorn Helgaas Cc: Andi Kleen Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Borislav Petkov Cc: linux-pci@vger.kernel.org Link: http://lkml.kernel.org/r/20170316215056.967808646@linutronix.de Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/pci.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index f513cc2..473a729 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -77,14 +77,8 @@ static inline bool is_vmd(struct pci_bus *bus) extern unsigned int pcibios_assign_all_busses(void); extern int pci_legacy_init(void); -# ifdef CONFIG_ACPI -# define x86_default_pci_init pci_acpi_init -# else -# define x86_default_pci_init pci_legacy_init -# endif #else -# define pcibios_assign_all_busses() 0 -# define x86_default_pci_init NULL +static inline int pcibios_assign_all_busses(void) { return 0; } #endif extern unsigned long pci_mem_start;