From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754588AbdCPXMH (ORCPT ); Thu, 16 Mar 2017 19:12:07 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:55017 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754505AbdCPXMD (ORCPT ); Thu, 16 Mar 2017 19:12:03 -0400 Message-Id: <20170316215056.967808646@linutronix.de> User-Agent: quilt/0.63-1 Date: Thu, 16 Mar 2017 22:50:03 +0100 From: Thomas Gleixner To: LKML Cc: Bjorn Helgaas , x86@kernel.org, Peter Anvin , Borislav Petkov , Peter Zijlstra , Stephane Eranian , Andi Kleen Subject: [patch 1/7] x86/pci: Remove duplicate defines References: <20170316215002.726697858@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=x86-pci--Remove-duplicate-defines.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For some historic reason these defines are duplicated. Remove them. Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/pci.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -76,14 +76,8 @@ static inline bool is_vmd(struct pci_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;