From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 05/21] drivers/net/3c515.c: replace init_module&cleanup_module with module_init&module_exit Date: Fri, 28 Mar 2008 14:41:17 -0700 Message-ID: <200803282141.m2SLfIem011813@imap1.linux-foundation.org> Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, jkschind@gmail.com To: jeff@garzik.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:36193 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755427AbYC1Vlx (ORCPT ); Fri, 28 Mar 2008 17:41:53 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: Jon Schindler Replace init_module and cleanup_module with static functions and module_init/module_exit. Signed-off-by: Jon Schindler Signed-off-by: Andrew Morton --- 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 */ /* _