From: Henrik Kretzschmar This changes the pci_module_init macro into a static inline function, which is marked as deprecated. This should help developers of new drivers to use pci_register_driver(). Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton --- include/linux/pci.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff -puN include/linux/pci.h~mark-pci_module_init-deprecated include/linux/pci.h --- a/include/linux/pci.h~mark-pci_module_init-deprecated +++ a/include/linux/pci.h @@ -389,12 +389,6 @@ struct pci_driver { .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID -/* - * pci_module_init is obsolete, this stays here till we fix up all usages of it - * in the tree. - */ -#define pci_module_init pci_register_driver - /** * PCI_VDEVICE - macro used to describe a specific pci device in short form * @vendor: the vendor name @@ -575,6 +569,16 @@ static inline int __must_check pci_regis return __pci_register_driver(driver, THIS_MODULE); } +/* + * pci_module_init is obsolete, this stays here till we fix up all usages of it + * in the tree. + */ + +static inline int __deprecated pci_module_init(struct pci_driver* drv) +{ + return pci_register_driver(drv); +} + void pci_unregister_driver(struct pci_driver *); void pci_remove_behind_bridge(struct pci_dev *); struct pci_driver *pci_dev_driver(const struct pci_dev *); _