diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 21:27:39 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 21:27:39 +0300 |
| commit | db7a726ea8a26ae1e418f9e08845d64cbc079480 (patch) | |
| tree | f65bf5e3d466975b1f4e44d3bbbb726f08b0377b | |
| parent | 09baca98411f4688be6e2deb312ffa2c42474b59 (diff) | |
| parent | 5cf0c37a71da0f3a4802806c597b21d99c33ca60 (diff) | |
| download | linux-db7a726ea8a26ae1e418f9e08845d64cbc079480.tar.xz | |
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()
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 | ||||
| -rw-r--r-- | include/linux/pci.h | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 173d0095e3b2..ca17508fd28c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -434,7 +434,10 @@ static int i915_getparam(struct drm_device *dev, void *data, static int i915_get_bridge_dev(struct drm_i915_private *dev_priv) { - dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); + int domain = pci_domain_nr(dev_priv->drm.pdev->bus); + + dev_priv->bridge_dev = + pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(0, 0)); if (!dev_priv->bridge_dev) { DRM_ERROR("bridge device not found\n"); return -1; 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; } |