diff options
author | Jon Schindler <jkschind@gmail.com> | 2008-04-29 03:59:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:03 -0400 |
commit | 7afea3bcb1f87f3ddf34b38f202ad0d03f29e120 (patch) | |
tree | f9c12ff816306d5a9d4387f64bc07104f415c34d /drivers | |
parent | 5045bcae0fb466a1dbb6af0036e56901fd7aafb7 (diff) |
drivers/block/floppy.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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/floppy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 7652e87d60c5..395f8ea7981c 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -4526,14 +4526,15 @@ static void __init parse_floppy_cfg_string(char *cfg) | |||
4526 | } | 4526 | } |
4527 | } | 4527 | } |
4528 | 4528 | ||
4529 | int __init init_module(void) | 4529 | static int __init floppy_module_init(void) |
4530 | { | 4530 | { |
4531 | if (floppy) | 4531 | if (floppy) |
4532 | parse_floppy_cfg_string(floppy); | 4532 | parse_floppy_cfg_string(floppy); |
4533 | return floppy_init(); | 4533 | return floppy_init(); |
4534 | } | 4534 | } |
4535 | module_init(floppy_module_init); | ||
4535 | 4536 | ||
4536 | void cleanup_module(void) | 4537 | static void __exit floppy_module_exit(void) |
4537 | { | 4538 | { |
4538 | int drive; | 4539 | int drive; |
4539 | 4540 | ||
@@ -4562,6 +4563,7 @@ void cleanup_module(void) | |||
4562 | /* eject disk, if any */ | 4563 | /* eject disk, if any */ |
4563 | fd_eject(0); | 4564 | fd_eject(0); |
4564 | } | 4565 | } |
4566 | module_exit(floppy_module_exit); | ||
4565 | 4567 | ||
4566 | module_param(floppy, charp, 0); | 4568 | module_param(floppy, charp, 0); |
4567 | module_param(FLOPPY_IRQ, int, 0); | 4569 | module_param(FLOPPY_IRQ, int, 0); |