The patch titled drivers/net/3c515.c: replace init_module&cleanup_module with module_init&module_exit has been added to the -mm tree. Its filename is drivers-net-3c515c-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/3c515.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/3c515.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff -puN drivers/net/3c515.c~drivers-net-3c515c-replace-init_modulecleanup_module-with-module_initmodule_exit drivers/net/3c515.c --- a/drivers/net/3c515.c~drivers-net-3c515c-replace-init_modulecleanup_module-with-module_initmodule_exit +++ a/drivers/net/3c515.c @@ -415,7 +415,7 @@ MODULE_PARM_DESC(max_interrupt_work, "3c /* we will need locking (and refcounting) if we ever use it for more */ static LIST_HEAD(root_corkscrew_dev); -int init_module(void) +static int __init tc515_module_init(void) { int found = 0; if (debug >= 0) @@ -426,6 +426,7 @@ int init_module(void) found++; return found ? 0 : -ENODEV; } +module_init(tc515_module_init); #else struct net_device *tc515_probe(int unit) @@ -1565,7 +1566,7 @@ static const struct ethtool_ops netdev_e #ifdef MODULE -void cleanup_module(void) +static void __exit tc515_module_exit(void) { while (!list_empty(&root_corkscrew_dev)) { struct net_device *dev; @@ -1579,6 +1580,8 @@ void cleanup_module(void) free_netdev(dev); } } +module_exit(tc515_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