Skip to contentSkip to conversation

/drivers/char/ip2/ip2main.c replaced init_module&cleanup_module with module_init&module_exit

PATCH In review Jon Schindler 2 participants 2 messages Mar 5, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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.

---

drivers/char/ip2/ip2main.c +6 -4
index b1d6cad..048e7c8 100644
@@ -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 = {
#1 lore raw
Quoted 2 lines · Jon Schindler

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

trivial comments

drivers/char/ip2/ip2main.c have_requested_irq( char irq ) · line 359

Quoted 6 lines

#ifdef MODULE

drivers/char/ip2/ip2main.c +2 -2
-int
-init_module(void)
+static int __init
+ip2_init_module(void)
 {

+static int __init ip2_init_module(void)

drivers/char/ip2/ip2main.c init_module(void) · line 386

Quoted 7 lines

****************************************************************/
#ifdef MODULE

drivers/char/ip2/ip2main.c +2 -2
-void
-cleanup_module(void)
+void __exit
+ip2_cleanup_module(void)
 {

+void __exit ip2_cleanup_module(void)

Cheers,

Harvey