summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTomasz Nowicki <tn@semihalf.com>2016-06-10 23:36:26 +0300
committerBjorn Helgaas <bhelgaas@google.com>2016-06-11 02:28:39 +0300
commit2ab51ddeca2fc32a7040d8560415be3366fa9ba7 (patch)
tree4db4d6e2af8dcdbce19338ae78f3ce84806fbd7c /include
parent1a4f93f7112fd92383534f4c23d7b24fd4f8833c (diff)
downloadlinux-2ab51ddeca2fc32a7040d8560415be3366fa9ba7.tar.xz
ARM64: PCI: Add acpi_pci_bus_find_domain_nr()
Extend pci_bus_find_domain_nr() so it can find the domain from either: - ACPI, via the new acpi_pci_bus_find_domain_nr() interface, or - DT, via of_pci_bus_find_domain_nr() Note that this is only used for CONFIG_PCI_DOMAINS_GENERIC=y, so it does not affect x86 or ia64. [bhelgaas: changelog] Signed-off-by: Tomasz Nowicki <tn@semihalf.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 48839e817ef2..0671e9a840cb 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1390,6 +1390,12 @@ static inline int pci_domain_nr(struct pci_bus *bus)
{
return bus->domain_nr;
}
+#ifdef CONFIG_ACPI
+int acpi_pci_bus_find_domain_nr(struct pci_bus *bus);
+#else
+static inline int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
+{ return 0; }
+#endif
int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent);
#endif