The patch titled drivers/net/at1700.c: replace init_module&cleanup_module with module_init&module_exit has been added to the -mm tree. Its filename is drivers-net-at1700c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/net/at1700.c: replace init_module&cleanup_module with module_init&module_exit From: Jon Schindler <jkschind@xxxxxxxxx> Replaced init_module and cleanup_module with static functions and module_init/module_exit. Signed-off-by: Jon Schindler <jkschind@xxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/at1700.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN drivers/net/at1700.c~drivers-net-at1700c-replace-init_modulecleanup_module-with-module_initmodule_exit drivers/net/at1700.c --- a/drivers/net/at1700.c~drivers-net-at1700c-replace-init_modulecleanup_module-with-module_initmodule_exit +++ a/drivers/net/at1700.c @@ -881,7 +881,7 @@ MODULE_PARM_DESC(io, "AT1700/FMV18X I/O MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number"); MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)"); -int __init init_module(void) +static int __init at1700_module_init(void) { if (io == 0) printk("at1700: You should not use auto-probing with insmod!\n"); @@ -891,13 +891,14 @@ int __init init_module(void) return 0; } -void __exit -cleanup_module(void) +static void __exit at1700_module_exit(void) { unregister_netdev(dev_at1700); cleanup_card(dev_at1700); free_netdev(dev_at1700); } +module_init(at1700_module_init); +module_exit(at1700_module_exit); #endif /* MODULE */ MODULE_LICENSE("GPL"); _ Patches currently in -mm which might be from jkschind@xxxxxxxxx are drivers-net-8390c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-apnec-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-appletalk-copsc-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-appletalk-ltpcc-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-arcnet-capmodec-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-arcnet-com20020c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-at1700c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-atarilancec-replace-init_modulecleanup_module-with-module_initmodule_exit.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