aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-10-24 12:27:18 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-05 16:35:17 -0500
commitd73460d79bc88de74221d73723ed61a0081b7a36 (patch)
tree9390f8114a95bb2943a682581104b4cc6ff390e7
parent5257dca0bdc36027a4bfc1002264bd465e86ab7a (diff)
PCI: make pci_match_device() static
pci_match_device() no longer has any other users. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/pci/pci-driver.c5
-rw-r--r--include/linux/pci.h2
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 */
146const struct pci_device_id *pci_match_device(struct pci_driver *drv, 146static 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)
559postcore_initcall(pci_driver_init); 559postcore_initcall(pci_driver_init);
560 560
561EXPORT_SYMBOL(pci_match_id); 561EXPORT_SYMBOL(pci_match_id);
562EXPORT_SYMBOL(pci_match_device);
563EXPORT_SYMBOL(__pci_register_driver); 562EXPORT_SYMBOL(__pci_register_driver);
564EXPORT_SYMBOL(pci_unregister_driver); 563EXPORT_SYMBOL(pci_unregister_driver);
565EXPORT_SYMBOL(pci_dev_driver); 564EXPORT_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)
631void pci_unregister_driver(struct pci_driver *); 631void pci_unregister_driver(struct pci_driver *);
632void pci_remove_behind_bridge(struct pci_dev *); 632void pci_remove_behind_bridge(struct pci_dev *);
633struct pci_driver *pci_dev_driver(const struct pci_dev *); 633struct pci_driver *pci_dev_driver(const struct pci_dev *);
634const struct pci_device_id *pci_match_device(struct pci_driver *drv, struct pci_dev *dev);
635const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); 634const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev);
636int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass); 635int 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) { }
760static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } 759static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; }
761static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } 760static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; }
762static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; } 761static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; }
763static 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 */
766static inline int pci_save_state(struct pci_dev *dev) { return 0; } 764static inline int pci_save_state(struct pci_dev *dev) { return 0; }