2008-03-05 05:50:22

by Jon Schindler

Subject: [PATCH 3/11] /drivers/char/ip2/ip2main.c replaced init_module&cleanup_module with module_init&module_exit

Replaced init_module and cleanup_module with static functions and module_init/module_exit.

Signed-off-by: Jon Schindler <[email protected]>
---
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index b1d6cad..048e7c8 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -354,14 +354,15 @@ have_requested_irq( char irq )
/* the driver initialisation function and returns what it returns. */
/******************************************************************************/
#ifdef MODULE
-int
-init_module(void)
+static int __init
+ip2_init_module(void)
{
#ifdef IP2DEBUG_INIT
printk (KERN_DEBUG "Loading module ...\n" );
#endif
return 0;
}
+module_init(ip2_init_module);
#endif /* MODULE */

/******************************************************************************/
@@ -380,8 +381,8 @@ init_module(void)
/* driver should be returned since it may be unloaded from memory. */
/******************************************************************************/
#ifdef MODULE
-void
-cleanup_module(void)
+void __exit
+ip2_cleanup_module(void)
{
int err;
int i;
@@ -451,6 +452,7 @@ cleanup_module(void)
printk (KERN_DEBUG "IP2 Unloaded\n" );
#endif
}
+module_exit(ip2_cleanup_module);
#endif /* MODULE */

static const struct tty_operations ip2_ops = {

2008-03-05 06:29:01

by Harvey Harrison

Subject: Re: [PATCH 3/11] /drivers/char/ip2/ip2main.c replaced init_module&cleanup_module with module_init&module_exit

On Tue, 2008-03-04 at 23:49 -0600, Jon Schindler wrote:
> Replaced init_module and cleanup_module with static functions and module_init/module_exit.
>

trivial comments

> #ifdef MODULE
> -int
> -init_module(void)
> +static int __init
> +ip2_init_module(void)
> {

+static int __init ip2_init_module(void)

> ****************************************************************/
> #ifdef MODULE
> -void
> -cleanup_module(void)
> +void __exit
> +ip2_cleanup_module(void)
> {

+void __exit ip2_cleanup_module(void)

Cheers,

Harvey