summaryrefslogtreecommitdiff
path: root/drivers/pci/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-05-04 18:43:25 +0300
committerBjorn Helgaas <bhelgaas@google.com>2021-05-04 18:43:25 +0300
commitccfc1d557023af3f53da954402f9784cea2597d7 (patch)
tree4df29d45eabd3cb7540264b4a869fc5793117ba2 /drivers/pci/pci.h
parent22d106733a2579f68b19170f575f786bbfbf88f3 (diff)
parentccd61f07d28912dcd6a61ea73f5d69af7ad88efa (diff)
downloadlinux-ccfc1d557023af3f53da954402f9784cea2597d7.tar.xz
Merge branch 'pci/misc'
- Fix compile testing of al driver without CONFIG_PCI_ECAM (Arnd Bergmann) - Fix compile testing of thunder drivers (Arnd Bergmann) - Fix "no symbols" warnings when compile testing al, thunder driver with CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann) - Remove unused MicroGate SyncLink device IDs (Jiri Slaby) - Remove unused alloc_pci_root_info() return value (Krzysztof WilczyƄski) * pci/misc: x86/PCI: Remove unused alloc_pci_root_info() return value PCI: Remove MicroGate SyncLink device IDs PCI: Avoid building empty drivers PCI: thunder: Fix compile testing PCI: al: Select CONFIG_PCI_ECAM
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r--drivers/pci/pci.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 0c7c57c8bfa6..4c13e2ff05eb 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -617,6 +617,12 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe)
#if defined(CONFIG_PCI_QUIRKS) && defined(CONFIG_ARM64)
int acpi_get_rc_resources(struct device *dev, const char *hid, u16 segment,
struct resource *res);
+#else
+static inline int acpi_get_rc_resources(struct device *dev, const char *hid,
+ u16 segment, struct resource *res)
+{
+ return -ENODEV;
+}
#endif
int pci_rebar_get_current_size(struct pci_dev *pdev, int bar);