aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-09-03 02:26:36 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-09 16:43:58 -0400
commit9dba910e9de2c4aa15ec1286f10052c107ef48ca (patch)
tree4870eccc95e406ae8d490136f5d65953203418c8 /include/linux/pci.h
parent825c423a35a80a8fd66398a3f9bde7f0b0187a76 (diff)
PCI: separate out pci_add_dynid()
Separate out pci_add_dynid() from store_new_id() and export it so that in-kernel code can add PCI IDs dynamically. As the function will be available regardless of HOTPLUG, put it and pull pci_free_dynids() outside of CONFIG_HOTPLUG. This will be used by pci-stub to initialize initial IDs via module param. While at it, remove bogus get_driver() failure check. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Reviewed-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index da90217a7b0e..d75668317705 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -796,6 +796,11 @@ int __must_check __pci_register_driver(struct pci_driver *, struct module *,
796void pci_unregister_driver(struct pci_driver *dev); 796void pci_unregister_driver(struct pci_driver *dev);
797void pci_remove_behind_bridge(struct pci_dev *dev); 797void pci_remove_behind_bridge(struct pci_dev *dev);
798struct pci_driver *pci_dev_driver(const struct pci_dev *dev); 798struct pci_driver *pci_dev_driver(const struct pci_dev *dev);
799int pci_add_dynid(struct pci_driver *drv,
800 unsigned int vendor, unsigned int device,
801 unsigned int subvendor, unsigned int subdevice,
802 unsigned int class, unsigned int class_mask,
803 unsigned long driver_data);
799const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, 804const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
800 struct pci_dev *dev); 805 struct pci_dev *dev);
801int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, 806int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,