[KJ] [PATCH 1/1] getting rid of init_module and cleanup_module in drivers/net/3c503.c

2 views
Skip to first unread message

Liran Tal

unread,
Oct 15, 2007, 11:19:43 AM10/15/07
to kernel-janitors

getting rid of init_module and cleanup_module in older driver(s)

Signed-off-by: Liran Tal <lira...@gmail.com>
---


--- a/drivers/net/3c503.c.orig 2007-10-15 17:10:52.000000000
+0200 +++ a/drivers/net/3c503.c 2007-10-15 17:11:02.000000000
+0200 @@ -30,6 +30,8 @@
Paul Gortmaker : multiple card support for module users.
rjoh...@analogic.com : Fix up PIO interface for efficient
operation. Jeff Garzik : ethtool support
+ Liran Tal : Oct 2007 <lira...@gmail.com>
+ getting rid of init_module and
cleanup_module
*/

@@ -687,8 +689,7 @@ MODULE_LICENSE("GPL");

/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
-int __init
-init_module(void)
+static int __init module_3c503_init(void)
{
struct net_device *dev;
int this_dev, found = 0;
@@ -717,7 +718,8 @@ init_module(void)
return -ENXIO;
}

-static void cleanup_card(struct net_device *dev)
+static void
+cleanup_card(struct net_device *dev)
{
/* NB: el2_close() handles free_irq */
release_region(dev->base_addr, EL2_IO_EXTENT);
@@ -725,8 +727,7 @@ static void cleanup_card(struct net_devi
iounmap(ei_status.mem);
}

-void __exit
-cleanup_module(void)
+static void __exit module_3c503_exit(void)
{
int this_dev;

@@ -739,4 +740,9 @@ cleanup_module(void)
}
}
}
+
+
+module_init(module_3c503_init);
+module_exit(module_3c503_exit);
+
#endif /* MODULE */
_______________________________________________
REMINDER: this mailing list moved to vger.kernel.org and current one will be discontinued soon.
To resubscribe, send email to majo...@vger.kernel.org with
&quot;subscribe kernel-janitors&quot; in message body and follow instructions.

Kernel-janitors mailing list
Kernel-...@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

Thomas De Schampheleire

unread,
Oct 15, 2007, 11:39:25 AM10/15/07
to Liran Tal, kernel-janitors
Hello,

On 10/15/07, Liran Tal <lirans...@gmail.com> wrote:
>
> getting rid of init_module and cleanup_module in older driver(s)
>
> Signed-off-by: Liran Tal <lira...@gmail.com>
> ---

[...]


> -int __init
> -init_module(void)
> +static int __init module_3c503_init(void)
> {

[...]


>
> -static void cleanup_card(struct net_device *dev)
> +static void
> +cleanup_card(struct net_device *dev)
> {

[...]


> -void __exit
> -cleanup_module(void)
> +static void __exit module_3c503_exit(void)
> {

I wonder why you put the return type on the same line as the function
name in two of the three functions, and on two lines in the other.

Unfortunately I cannot comment on the actual contents of the patch.

Best regards,
Thomas

Reply all
Reply to author
Forward
0 new messages