Commit db7a726e authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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()
parents 09baca98 5cf0c37a

drivers/gpu/drm/i915/i915_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/pci.h

+0 −8
Original line number Diff line number Diff line
@@ -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; }