diff options
-rw-r--r-- | drivers/pci/search.c | 30 | ||||
-rw-r--r-- | include/linux/pci.h | 8 |
2 files changed, 0 insertions, 38 deletions
diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 710d4ea69568..650bc0a538dc 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c | |||
@@ -115,36 +115,6 @@ pci_find_next_bus(const struct pci_bus *from) | |||
115 | 115 | ||
116 | #ifdef CONFIG_PCI_LEGACY | 116 | #ifdef CONFIG_PCI_LEGACY |
117 | /** | 117 | /** |
118 | * pci_find_slot - locate PCI device from a given PCI slot | ||
119 | * @bus: number of PCI bus on which desired PCI device resides | ||
120 | * @devfn: encodes number of PCI slot in which the desired PCI | ||
121 | * device resides and the logical device number within that slot | ||
122 | * in case of multi-function devices. | ||
123 | * | ||
124 | * Given a PCI bus and slot/function number, the desired PCI device | ||
125 | * is located in system global list of PCI devices. If the device | ||
126 | * is found, a pointer to its data structure is returned. If no | ||
127 | * device is found, %NULL is returned. | ||
128 | * | ||
129 | * NOTE: Do not use this function any more; use pci_get_slot() instead, as | ||
130 | * the PCI device returned by this function can disappear at any moment in | ||
131 | * time. | ||
132 | */ | ||
133 | struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn) | ||
134 | { | ||
135 | struct pci_dev *dev = NULL; | ||
136 | |||
137 | while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | ||
138 | if (dev->bus->number == bus && dev->devfn == devfn) { | ||
139 | pci_dev_put(dev); | ||
140 | return dev; | ||
141 | } | ||
142 | } | ||
143 | return NULL; | ||
144 | } | ||
145 | EXPORT_SYMBOL(pci_find_slot); | ||
146 | |||
147 | /** | ||
148 | * pci_find_device - begin or continue searching for a PCI device by vendor/device id | 118 | * pci_find_device - begin or continue searching for a PCI device by vendor/device id |
149 | * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids | 119 | * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids |
150 | * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids | 120 | * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 6dfa47d25ba4..19ee92c53ef7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -599,8 +599,6 @@ extern void pci_sort_breadthfirst(void); | |||
599 | struct pci_dev __deprecated *pci_find_device(unsigned int vendor, | 599 | struct pci_dev __deprecated *pci_find_device(unsigned int vendor, |
600 | unsigned int device, | 600 | unsigned int device, |
601 | struct pci_dev *from); | 601 | struct pci_dev *from); |
602 | struct pci_dev __deprecated *pci_find_slot(unsigned int bus, | ||
603 | unsigned int devfn); | ||
604 | #endif /* CONFIG_PCI_LEGACY */ | 602 | #endif /* CONFIG_PCI_LEGACY */ |
605 | 603 | ||
606 | enum pci_lost_interrupt_reason { | 604 | enum pci_lost_interrupt_reason { |
@@ -936,12 +934,6 @@ static inline struct pci_dev *pci_find_device(unsigned int vendor, | |||
936 | return NULL; | 934 | return NULL; |
937 | } | 935 | } |
938 | 936 | ||
939 | static inline struct pci_dev *pci_find_slot(unsigned int bus, | ||
940 | unsigned int devfn) | ||
941 | { | ||
942 | return NULL; | ||
943 | } | ||
944 | |||
945 | static inline struct pci_dev *pci_get_device(unsigned int vendor, | 937 | static inline struct pci_dev *pci_get_device(unsigned int vendor, |
946 | unsigned int device, | 938 | unsigned int device, |
947 | struct pci_dev *from) | 939 | struct pci_dev *from) |