The patch titled drivers/net/82596.c: replace init_module&cleanup_module with module_init&module_exit has been added to the -mm tree. Its filename is drivers-net-82596c-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/82596.c: replace init_module&cleanup_module with module_init&module_exit From: Jon Schindler <jkschind@xxxxxxxxx> Replace init_module and cleanup_module with static functions and module_init/module_exit. Signed-off-by: Jon Schindler <jkschind@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/82596.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN drivers/net/82596.c~drivers-net-82596c-replace-init_modulecleanup_module-with-module_initmodule_exit drivers/net/82596.c --- a/drivers/net/82596.c~drivers-net-82596c-replace-init_modulecleanup_module-with-module_initmodule_exit +++ a/drivers/net/82596.c @@ -1567,7 +1567,7 @@ static int debug = -1; module_param(debug, int, 0); MODULE_PARM_DESC(debug, "i82596 debug mask"); -int __init init_module(void) +static int __init i82596_module_init(void) { if (debug >= 0) i596_debug = debug; @@ -1576,8 +1576,9 @@ int __init init_module(void) return PTR_ERR(dev_82596); return 0; } +module_init(i82596_module_init); -void __exit cleanup_module(void) +static void __exit i82596_module_exit(void) { unregister_netdev(dev_82596); #ifdef __mc68000__ @@ -1595,7 +1596,7 @@ void __exit cleanup_module(void) #endif free_netdev(dev_82596); } - +module_exit(i82596_module_exit); #endif /* MODULE */ /* _ Patches currently in -mm which might be from jkschind@xxxxxxxxx are 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 drivers-net-8390c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-ac3200c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-block-floppyc-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-char-ip2-ip2mainc-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-ide-idec-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-3c501c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-3c505c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-3c507c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-3c515c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-3c523c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-3c527c-replace-init_modulecleanup_module-with-module_initmodule_exit.patch drivers-net-82596c-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