The patch titled mark pci_module_init() deprecated has been added to the -mm tree. Its filename is mark-pci_module_init-deprecated.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: mark pci_module_init() deprecated From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx> 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 <henne@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/pci.h | 16 ++++++++++------ 1 files 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 @@ -384,12 +384,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 - /* these external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI @@ -549,6 +543,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 *); _ Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are documentation-for-lock_key-in-struct-hrtimer_base.patch add-missing-desctiption-in-superc.patch git-libata-all.patch kerneldoc-error-on-ata_piixc.patch git-netdev-all.patch git-net.patch git-scsi-misc.patch pci_module_init-conversion-in-scsi-subsys-2nd-try.patch docbook-fix-segfault-in-docprocc.patch pci_module_init-convertion-in-ata_genericc.patch pci_module_init-convertion-in-ata_genericc-fix.patch pci_module_init-convertion-in-amso1100-driver.patch pci_module_init-convertion-for-k8_edacc.patch pci_module_init-convertion-in-the-legacy-megaraid-driver.patch nozomi-pci_module_init-conversion.patch pci_module_init-convertion-in-olympicc.patch pci_module_init-conversion-for-pata_pdc2027x.patch pci_module_init-convertion-in-tmscsimc.patch mark-pci_module_init-deprecated.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html