aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7063241e34d9..60702fccf9e7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -433,8 +433,13 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
433 void *alignf_data); 433 void *alignf_data);
434void pci_enable_bridges(struct pci_bus *bus); 434void pci_enable_bridges(struct pci_bus *bus);
435 435
436/* New-style probing supporting hot-pluggable devices */ 436/* Proper probing supporting hot-pluggable devices */
437int pci_register_driver(struct pci_driver *); 437int __pci_register_driver(struct pci_driver *, struct module *);
438static inline int pci_register_driver(struct pci_driver *driver)
439{
440 return __pci_register_driver(driver, THIS_MODULE);
441}
442
438void pci_unregister_driver(struct pci_driver *); 443void pci_unregister_driver(struct pci_driver *);
439void pci_remove_behind_bridge(struct pci_dev *); 444void pci_remove_behind_bridge(struct pci_dev *);
440struct pci_driver *pci_dev_driver(const struct pci_dev *); 445struct pci_driver *pci_dev_driver(const struct pci_dev *);
@@ -548,6 +553,7 @@ static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; }
548static inline void pci_disable_device(struct pci_dev *dev) { } 553static inline void pci_disable_device(struct pci_dev *dev) { }
549static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } 554static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; }
550static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} 555static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;}
556static inline int __pci_register_driver(struct pci_driver *drv, struct module *owner) { return 0;}
551static inline int pci_register_driver(struct pci_driver *drv) { return 0;} 557static inline int pci_register_driver(struct pci_driver *drv) { return 0;}
552static inline void pci_unregister_driver(struct pci_driver *drv) { } 558static inline void pci_unregister_driver(struct pci_driver *drv) { }
553static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } 559static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; }