diff options
| author | Tomasz Nowicki <tn@semihalf.com> | 2016-06-10 21:55:14 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-06-10 18:28:12 -0500 |
| commit | 9c7cb891ecfea3b88e4fa255afeec0da84ea6a86 (patch) | |
| tree | b873f884250bc730ffb4dd7729beab4ae63b5a18 /drivers/pci/probe.c | |
| parent | 935c760ec8101413248da23b6df45f0a7a643c62 (diff) | |
| download | linux-stable-9c7cb891ecfea3b88e4fa255afeec0da84ea6a86.tar.gz linux-stable-9c7cb891ecfea3b88e4fa255afeec0da84ea6a86.tar.bz2 linux-stable-9c7cb891ecfea3b88e4fa255afeec0da84ea6a86.zip | |
PCI: Refactor pci_bus_assign_domain_nr() for CONFIG_PCI_DOMAINS_GENERIC
Instead of assigning bus->domain_nr inside pci_bus_assign_domain_nr(),
return the domain and let the caller do the assignment. Rename
pci_bus_assign_domain_nr() to pci_bus_find_domain_nr() to reflect this.
No functional change intended.
[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>
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8e3ef720997d..380d46dc9a70 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2127,7 +2127,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, b->sysdata = sysdata; b->ops = ops; b->number = b->busn_res.start = bus; - pci_bus_assign_domain_nr(b, parent); +#ifdef CONFIG_PCI_DOMAINS_GENERIC + b->domain_nr = pci_bus_find_domain_nr(b, parent); +#endif b2 = pci_find_bus(pci_domain_nr(b), bus); if (b2) { /* If we already got to this bus through a different bridge, ignore it */ |