Commit 3b073eda authored by Alex Chiang's avatar Alex Chiang Committed by Jesse Barnes
Browse files

PCI: remove deprecated pci_find_slot() interface 



The last in-tree caller of pci_find_slot has been converted, so
let's get rid of this deprecated interface.

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 12a9da0f

drivers/pci/search.c

+0 −30
Original line number Diff line number Diff line
@@ -114,36 +114,6 @@ pci_find_next_bus(const struct pci_bus *from) 
}



#ifdef CONFIG_PCI_LEGACY

/**

 * pci_find_slot - locate PCI device from a given PCI slot

 * @bus: number of PCI bus on which desired PCI device resides

 * @devfn: encodes number of PCI slot in which the desired PCI

 * device resides and the logical device number within that slot

 * in case of multi-function devices.

 *

 * Given a PCI bus and slot/function number, the desired PCI device

 * is located in system global list of PCI devices.  If the device

 * is found, a pointer to its data structure is returned.  If no

 * device is found, %NULL is returned.

 *

 * NOTE: Do not use this function any more; use pci_get_slot() instead, as

 * the PCI device returned by this function can disappear at any moment in

 * time.

 */

struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn)

{

	struct pci_dev *dev = NULL;



	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

		if (dev->bus->number == bus && dev->devfn == devfn) {

			pci_dev_put(dev);

			return dev;

		}

	}

	return NULL;

}

EXPORT_SYMBOL(pci_find_slot);



/**

 * pci_find_device - begin or continue searching for a PCI device by vendor/device id

 * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids

include/linux/pci.h

+0 −8
Original line number Diff line number Diff line
@@ -599,8 +599,6 @@ extern void pci_sort_breadthfirst(void); 
struct pci_dev __deprecated *pci_find_device(unsigned int vendor,

					     unsigned int device,

					     struct pci_dev *from);

struct pci_dev __deprecated *pci_find_slot(unsigned int bus,

					   unsigned int devfn);

#endif /* CONFIG_PCI_LEGACY */



enum pci_lost_interrupt_reason {
@@ -936,12 +934,6 @@ static inline struct pci_dev *pci_find_device(unsigned int vendor, 
	return NULL;

}



static inline struct pci_dev *pci_find_slot(unsigned int bus,

					    unsigned int devfn)

{

	return NULL;

}



static inline struct pci_dev *pci_get_device(unsigned int vendor,

					     unsigned int device,

					     struct pci_dev *from)