diff options
author | Brice Goglin <brice@myri.com> | 2006-05-23 06:10:01 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 00:27:31 -0400 |
commit | 3a720d726a6aa0a7cd9190f694587adf7bafdf4f (patch) | |
tree | 2162cbeb1786c8f7826c7e19850bae52395dacea | |
parent | d99ef36ed7e56f816a235f1af115420a81853fb9 (diff) |
[PATCH] Revive pci_find_ext_capability
This patch revives pci_find_ext_capability (has been disabled a couple month
ago since it was not used anywhere. See http://lkml.org/lkml/2006/1/20/247).
It will now be used by the myri10ge driver.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew J. Gallatin <gallatin@myri.com>
drivers/pci/pci.c | 3 +--
include/linux/pci.h | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/pci/pci.c | 3 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 2329f941a0dc..8d107c6c2c70 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -164,7 +164,6 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap) | |||
164 | return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap); | 164 | return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap); |
165 | } | 165 | } |
166 | 166 | ||
167 | #if 0 | ||
168 | /** | 167 | /** |
169 | * pci_find_ext_capability - Find an extended capability | 168 | * pci_find_ext_capability - Find an extended capability |
170 | * @dev: PCI device to query | 169 | * @dev: PCI device to query |
@@ -212,7 +211,7 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap) | |||
212 | 211 | ||
213 | return 0; | 212 | return 0; |
214 | } | 213 | } |
215 | #endif /* 0 */ | 214 | EXPORT_SYMBOL_GPL(pci_find_ext_capability); |
216 | 215 | ||
217 | /** | 216 | /** |
218 | * pci_find_parent_resource - return resource region of parent bus of given region | 217 | * pci_find_parent_resource - return resource region of parent bus of given region |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3a6a4e37a482..6fd36cb09160 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -442,6 +442,7 @@ struct pci_dev *pci_find_device_reverse (unsigned int vendor, unsigned int devic | |||
442 | struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn); | 442 | struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn); |
443 | int pci_find_capability (struct pci_dev *dev, int cap); | 443 | int pci_find_capability (struct pci_dev *dev, int cap); |
444 | int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap); | 444 | int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap); |
445 | int pci_find_ext_capability (struct pci_dev *dev, int cap); | ||
445 | struct pci_bus * pci_find_next_bus(const struct pci_bus *from); | 446 | struct pci_bus * pci_find_next_bus(const struct pci_bus *from); |
446 | 447 | ||
447 | struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from); | 448 | struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from); |
@@ -662,6 +663,7 @@ static inline int pci_register_driver(struct pci_driver *drv) { return 0;} | |||
662 | static inline void pci_unregister_driver(struct pci_driver *drv) { } | 663 | static inline void pci_unregister_driver(struct pci_driver *drv) { } |
663 | static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } | 664 | static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } |
664 | static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } | 665 | static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } |
666 | static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; } | ||
665 | static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; } | 667 | static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; } |
666 | 668 | ||
667 | /* Power management related routines */ | 669 | /* Power management related routines */ |