diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:27:39 -0500 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:27:39 -0500 |
commit | db7a726ea8a26ae1e418f9e08845d64cbc079480 (patch) | |
tree | f65bf5e3d466975b1f4e44d3bbbb726f08b0377b /include/linux | |
parent | 09baca98411f4688be6e2deb312ffa2c42474b59 (diff) | |
parent | 5cf0c37a71da0f3a4802806c597b21d99c33ca60 (diff) | |
download | linux-db7a726ea8a26ae1e418f9e08845d64cbc079480.tar.gz linux-db7a726ea8a26ae1e418f9e08845d64cbc079480.tar.bz2 linux-db7a726ea8a26ae1e418f9e08845d64cbc079480.zip |
Merge branch 'pci/deprecate-get-bus-and-slot'
- remove last user of pci_get_bus_and_slot() and the function itself
(Sinan Kaya)
* pci/deprecate-get-bus-and-slot:
PCI: Remove pci_get_bus_and_slot() function
drm/i915: Deprecate pci_get_bus_and_slot()
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 19c1dbcff0c6..24e15510a946 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -949,11 +949,6 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn); struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus, unsigned int devfn); -static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, - unsigned int devfn) -{ - return pci_get_domain_bus_and_slot(0, bus, devfn); -} struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from); int pci_dev_present(const struct pci_device_id *ids); @@ -1661,9 +1656,6 @@ static inline struct pci_bus *pci_find_next_bus(const struct pci_bus *from) static inline struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn) { return NULL; } -static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus, - unsigned int devfn) -{ return NULL; } static inline struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus, unsigned int devfn) { return NULL; } |