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 /include/linux/pci.h | |
| parent | ae08aa13ba4b552d1e594192624cd4d2445118bb (diff) | |
| parent | 37bd62d224c8244bccdb1a5bd7833a48c9ba8a66 (diff) | |
| download | lwn-a7c9d4cf45e1352c3fcca0fabfdf9d7ff708d2ff.tar.gz lwn-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 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 2fbdb931bb26..d87556c7af07 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1516,12 +1516,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev); */ #ifdef CONFIG_PCI_DOMAINS extern int pci_domains_supported; -int pci_get_new_domain_nr(void); #else enum { pci_domains_supported = 0 }; static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline int pci_proc_domain(struct pci_bus *bus) { return 0; } -static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } #endif /* CONFIG_PCI_DOMAINS */ /* @@ -1676,7 +1674,6 @@ static inline struct pci_dev *pci_get_domain_bus_and_slot(int domain, static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; } -static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } #define dev_is_pci(d) (false) #define dev_is_pf(d) (false) |