Commit-ID: 9304d1621e6019c63497f8a4aad09d003916dbe9 Gitweb: http://git.kernel.org/tip/9304d1621e6019c63497f8a4aad09d003916dbe9 Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Thu, 16 Mar 2017 22:50:03 +0100 Committer: Thomas Gleixner <t...@linutronix.de> 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 <t...@linutronix.de> Acked-by: Bjorn Helgaas <helg...@kernel.org> Cc: Andi Kleen <a...@linux.intel.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Stephane Eranian <eran...@google.com> Cc: Borislav Petkov <b...@alien8.de> Cc: linux-...@vger.kernel.org Link: http://lkml.kernel.org/r/20170316215056.967808...@linutronix.de Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- 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;
