[+cc linux-pci]
On Thu, Mar 16, 2017 at 10:50:03PM +0100, Thomas Gleixner wrote:
> For some historic reason these defines are duplicated. Remove them.
Duplicated in arch/x86/include/asm/pci.h and
arch/x86/include/asm/pci_x86.h, I guess.
Good to remove the duplication, for sure. I wonder why we didn't see
duplicate definition warnings.
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> ---
> 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;
>
>
