diff options
author | Jon Schindler <jkschind@gmail.com> | 2008-04-30 03:53:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:44 -0400 |
commit | 83e422b7649267067975cbb17a878b5f9dfd2de3 (patch) | |
tree | aae3f223947c472ec4c60b5af9488b45472b0b96 | |
parent | 11fb09bfabd699a94555b69d6e6c4fa6c3febde8 (diff) |
drivers/char/ip2/ip2main.c: replace init_module&cleanup_module with module_init&module_exit
Replace init_module and cleanup_module with static functions and
module_init/module_exit.
Signed-off-by: Jon Schindler <jkschind@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/ip2/ip2main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 0a61856c631f..319f804fc4d6 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -355,14 +355,15 @@ have_requested_irq( char irq ) | |||
355 | /* the driver initialisation function and returns what it returns. */ | 355 | /* the driver initialisation function and returns what it returns. */ |
356 | /******************************************************************************/ | 356 | /******************************************************************************/ |
357 | #ifdef MODULE | 357 | #ifdef MODULE |
358 | int | 358 | static int __init |
359 | init_module(void) | 359 | ip2_init_module(void) |
360 | { | 360 | { |
361 | #ifdef IP2DEBUG_INIT | 361 | #ifdef IP2DEBUG_INIT |
362 | printk (KERN_DEBUG "Loading module ...\n" ); | 362 | printk (KERN_DEBUG "Loading module ...\n" ); |
363 | #endif | 363 | #endif |
364 | return 0; | 364 | return 0; |
365 | } | 365 | } |
366 | module_init(ip2_init_module); | ||
366 | #endif /* MODULE */ | 367 | #endif /* MODULE */ |
367 | 368 | ||
368 | /******************************************************************************/ | 369 | /******************************************************************************/ |
@@ -381,8 +382,8 @@ init_module(void) | |||
381 | /* driver should be returned since it may be unloaded from memory. */ | 382 | /* driver should be returned since it may be unloaded from memory. */ |
382 | /******************************************************************************/ | 383 | /******************************************************************************/ |
383 | #ifdef MODULE | 384 | #ifdef MODULE |
384 | void | 385 | void __exit |
385 | cleanup_module(void) | 386 | ip2_cleanup_module(void) |
386 | { | 387 | { |
387 | int err; | 388 | int err; |
388 | int i; | 389 | int i; |
@@ -452,6 +453,7 @@ cleanup_module(void) | |||
452 | printk (KERN_DEBUG "IP2 Unloaded\n" ); | 453 | printk (KERN_DEBUG "IP2 Unloaded\n" ); |
453 | #endif | 454 | #endif |
454 | } | 455 | } |
456 | module_exit(ip2_cleanup_module); | ||
455 | #endif /* MODULE */ | 457 | #endif /* MODULE */ |
456 | 458 | ||
457 | static const struct tty_operations ip2_ops = { | 459 | static const struct tty_operations ip2_ops = { |