diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:18 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:18 -0500 |
| commit | a7c9d4cf45e1352c3fcca0fabfdf9d7ff708d2ff (patch) | |
| tree | daaf3cbe743e3ee34a85cf8f446de0cd63ec17fc /drivers/pci/pci.c | |
| parent | ae08aa13ba4b552d1e594192624cd4d2445118bb (diff) | |
| parent | 37bd62d224c8244bccdb1a5bd7833a48c9ba8a66 (diff) | |
| download | blackbird-op-linux-a7c9d4cf45e1352c3fcca0fabfdf9d7ff708d2ff.tar.gz blackbird-op-linux-a7c9d4cf45e1352c3fcca0fabfdf9d7ff708d2ff.zip | |
Merge branch 'pci/resource'
- add managed interface to get PCI host bridge resources from OF (Jan
Kiszka)
- add support for unbinding generic PCI host controller (Jan Kiszka)
- fix memory leaks when unbinding generic PCI host controller (Jan Kiszka)
* pci/resource:
PCI: Enable PCI_DOMAINS along with generic PCI host controller
PCI: Add support for unbinding the generic PCI host controller
PCI: Rework of_pci_get_host_bridge_resources() to devm_of_pci_get_host_bridge_resources()
PCI: Use dev_printk() in of_pci_get_host_bridge_resources()
PCI: Pass struct device to of_pci_get_host_bridge_resources()
PCI: Rename of_pci_get_host_bridge_resources() device node parameter
PCI: Fix devm_pci_alloc_host_bridge() memory leak
PCI: Make pci_get_new_domain_nr() static
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 2aaab81341ac..1da93e6e8623 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5688,15 +5688,14 @@ static void pci_no_domains(void) #endif } -#ifdef CONFIG_PCI_DOMAINS +#ifdef CONFIG_PCI_DOMAINS_GENERIC static atomic_t __domain_nr = ATOMIC_INIT(-1); -int pci_get_new_domain_nr(void) +static int pci_get_new_domain_nr(void) { return atomic_inc_return(&__domain_nr); } -#ifdef CONFIG_PCI_DOMAINS_GENERIC static int of_pci_bus_find_domain_nr(struct device *parent) { static int use_dt_domains = -1; @@ -5751,7 +5750,6 @@ int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) acpi_pci_bus_find_domain_nr(bus); } #endif -#endif /** * pci_ext_cfg_avail - can we access extended PCI config space? |
