aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Nowicki <tn@semihalf.com>2016-06-10 15:55:15 -0400
committerBjorn Helgaas <bhelgaas@google.com>2016-06-10 19:28:32 -0400
commit1a4f93f7112fd92383534f4c23d7b24fd4f8833c (patch)
tree943aa86b38c33e0e298bd217e1302cfef30bc3fe
parent9c7cb891ecfea3b88e4fa255afeec0da84ea6a86 (diff)
PCI: Factor DT-specific pci_bus_find_domain_nr() code out
pci_bus_find_domain_nr() retrieves the host bridge domain number in a DT-specific way. Rename it to of_pci_bus_find_domain_nr() to reflect that, so we can add a corresponding function for ACPI. [bhelgaas: changelog] Signed-off-by: Tomasz Nowicki <tn@semihalf.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-rw-r--r--drivers/pci/pci.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b9a783385eae..97f7cd4a7e86 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4941,7 +4941,7 @@ int pci_get_new_domain_nr(void)
4941} 4941}
4942 4942
4943#ifdef CONFIG_PCI_DOMAINS_GENERIC 4943#ifdef CONFIG_PCI_DOMAINS_GENERIC
4944int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) 4944static int of_pci_bus_find_domain_nr(struct device *parent)
4945{ 4945{
4946 static int use_dt_domains = -1; 4946 static int use_dt_domains = -1;
4947 int domain = -1; 4947 int domain = -1;
@@ -4987,6 +4987,11 @@ int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)
4987 4987
4988 return domain; 4988 return domain;
4989} 4989}
4990
4991int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)
4992{
4993 return of_pci_bus_find_domain_nr(parent);
4994}
4990#endif 4995#endif
4991#endif 4996#endif
4992 4997