mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
![Rafael J. Wysocki](/assets/img/avatar_default.png)
After commit 415e12b237
("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>
46 lines
1.2 KiB
C
46 lines
1.2 KiB
C
/*
|
|
* File pci-acpi.h
|
|
*
|
|
* Copyright (C) 2004 Intel
|
|
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
|
|
*/
|
|
|
|
#ifndef _PCI_ACPI_H_
|
|
#define _PCI_ACPI_H_
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
#ifdef CONFIG_ACPI
|
|
extern acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev,
|
|
struct pci_bus *pci_bus);
|
|
extern acpi_status pci_acpi_remove_bus_pm_notifier(struct acpi_device *dev);
|
|
extern acpi_status pci_acpi_add_pm_notifier(struct acpi_device *dev,
|
|
struct pci_dev *pci_dev);
|
|
extern acpi_status pci_acpi_remove_pm_notifier(struct acpi_device *dev);
|
|
|
|
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
|
|
{
|
|
struct pci_bus *pbus = pdev->bus;
|
|
/* Find a PCI root bus */
|
|
while (!pci_is_root_bus(pbus))
|
|
pbus = pbus->parent;
|
|
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
|
|
pbus->number);
|
|
}
|
|
|
|
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
|
|
{
|
|
if (!pci_is_root_bus(pbus))
|
|
return DEVICE_ACPI_HANDLE(&(pbus->self->dev));
|
|
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
|
|
pbus->number);
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_ACPI_APEI
|
|
extern bool aer_acpi_firmware_first(void);
|
|
#else
|
|
static inline bool aer_acpi_firmware_first(void) { return false; }
|
|
#endif
|
|
|
|
#endif /* _PCI_ACPI_H_ */
|