diff options
-rw-r--r-- | drivers/pci/pci-driver.c | 5 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 6e2760b6c20a..6d1a21611818 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -143,8 +143,8 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, | |||
143 | * system is in its list of supported devices. Returns the matching | 143 | * system is in its list of supported devices. Returns the matching |
144 | * pci_device_id structure or %NULL if there is no match. | 144 | * pci_device_id structure or %NULL if there is no match. |
145 | */ | 145 | */ |
146 | const struct pci_device_id *pci_match_device(struct pci_driver *drv, | 146 | static const struct pci_device_id *pci_match_device(struct pci_driver *drv, |
147 | struct pci_dev *dev) | 147 | struct pci_dev *dev) |
148 | { | 148 | { |
149 | struct pci_dynid *dynid; | 149 | struct pci_dynid *dynid; |
150 | 150 | ||
@@ -559,7 +559,6 @@ static int __init pci_driver_init(void) | |||
559 | postcore_initcall(pci_driver_init); | 559 | postcore_initcall(pci_driver_init); |
560 | 560 | ||
561 | EXPORT_SYMBOL(pci_match_id); | 561 | EXPORT_SYMBOL(pci_match_id); |
562 | EXPORT_SYMBOL(pci_match_device); | ||
563 | EXPORT_SYMBOL(__pci_register_driver); | 562 | EXPORT_SYMBOL(__pci_register_driver); |
564 | EXPORT_SYMBOL(pci_unregister_driver); | 563 | EXPORT_SYMBOL(pci_unregister_driver); |
565 | EXPORT_SYMBOL(pci_dev_driver); | 564 | EXPORT_SYMBOL(pci_dev_driver); |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 7c04f38e6ac3..5b23ec7f6cd9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -631,7 +631,6 @@ static inline int __must_check pci_register_driver(struct pci_driver *driver) | |||
631 | void pci_unregister_driver(struct pci_driver *); | 631 | void pci_unregister_driver(struct pci_driver *); |
632 | void pci_remove_behind_bridge(struct pci_dev *); | 632 | void pci_remove_behind_bridge(struct pci_dev *); |
633 | struct pci_driver *pci_dev_driver(const struct pci_dev *); | 633 | struct pci_driver *pci_dev_driver(const struct pci_dev *); |
634 | const struct pci_device_id *pci_match_device(struct pci_driver *drv, struct pci_dev *dev); | ||
635 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); | 634 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); |
636 | int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass); | 635 | int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass); |
637 | 636 | ||
@@ -760,7 +759,6 @@ static inline void pci_unregister_driver(struct pci_driver *drv) { } | |||
760 | static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } | 759 | static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } |
761 | static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } | 760 | static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } |
762 | static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; } | 761 | static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; } |
763 | static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; } | ||
764 | 762 | ||
765 | /* Power management related routines */ | 763 | /* Power management related routines */ |
766 | static inline int pci_save_state(struct pci_dev *dev) { return 0; } | 764 | static inline int pci_save_state(struct pci_dev *dev) { return 0; } |