Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset

After commit 415e12b23792 ("PCI/ACPI: Request _OSC control once for each
root bridge (v3)") include/linux/pci-acpi.h is included by
drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the bogus and
unnecessary alternative definition of acpi_find_root_bridge_handle()
causes a build error to occur.

Remove the offending piece of garbage.

Reported-and-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Rafael J. Wysocki and committed by
Linus Torvalds
fc8fe1e9 f8206b92

-3
-3
include/linux/pci-acpi.h
··· 35 35 return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), 36 36 pbus->number); 37 37 } 38 - #else 39 - static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) 40 - { return NULL; } 41 38 #endif 42 39 43 40 #ifdef CONFIG_ACPI_APEI