renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

PCI: Refactor pci_bus_assign_domain_nr() for CONFIG_PCI_DOMAINS_GENERIC

Browse Source 
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>
This commit is contained in:
Tomasz Nowicki 2016-06-10 21:55:14 +02:00 committed by Bjorn Helgaas
parent 935c760ec8
commit 9c7cb891ec
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci.c
View File

@ -4941,7 +4941,7 @@ int pci_get_new_domain_nr(void)
} }
#ifdef CONFIG_PCI_DOMAINS_GENERIC #ifdef CONFIG_PCI_DOMAINS_GENERIC
void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)
{ {
static int use_dt_domains = -1; static int use_dt_domains = -1;
int domain = -1; int domain = -1;
@ -4985,7 +4985,7 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
domain = -1; domain = -1;
} }
bus->domain_nr = domain; return domain;
} }
#endif #endif
#endif #endif

4
drivers/pci/probe.c
View File

@ -2127,7 +2127,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
b->sysdata = sysdata; b->sysdata = sysdata;
b->ops = ops; b->ops = ops;
b->number = b->busn_res.start = bus; 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); b2 = pci_find_bus(pci_domain_nr(b), bus);
if (b2) { if (b2) {
/* If we already got to this bus through a different bridge, ignore it */ /* If we already got to this bus through a different bridge, ignore it */

7
include/linux/pci.h
View File

@ -1390,12 +1390,7 @@ static inline int pci_domain_nr(struct pci_bus *bus)
{ {
return bus->domain_nr; return bus->domain_nr;
} }
void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent); int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent);
#else
static inline void pci_bus_assign_domain_nr(struct pci_bus *bus,
struct device *parent)
{
}
#endif #endif
/* some architectures require additional setup to direct VGA traffic */ /* some architectures require additional setup to direct VGA traffic */