diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-24 00:31:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:40 -0400 |
commit | 5798712d608f5ebad994487748a2ccf3cc613d78 (patch) | |
tree | 4324fefe1bcf1447ca666abc95f87ef23e8fd1fe /drivers/video | |
parent | 104b198dd0b3b62a4fc4e9146f01f2abc718e926 (diff) |
drivers/video/amifb.c cleanups
This patch contains the following cleanups:
- make the needlessly global amifb_init() static
- rename cleanup_module() to amifb_exit(),
make it static __exit,
use module_exit(),
there's no need to #ifdef MODULE it
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/amifb.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 0c549aa1cf87..b8e9a8682f2d 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -1136,7 +1136,6 @@ static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg | |||
1136 | * Interface to the low level console driver | 1136 | * Interface to the low level console driver |
1137 | */ | 1137 | */ |
1138 | 1138 | ||
1139 | int amifb_init(void); | ||
1140 | static void amifb_deinit(void); | 1139 | static void amifb_deinit(void); |
1141 | 1140 | ||
1142 | /* | 1141 | /* |
@@ -2248,7 +2247,7 @@ static inline void chipfree(void) | |||
2248 | * Initialisation | 2247 | * Initialisation |
2249 | */ | 2248 | */ |
2250 | 2249 | ||
2251 | int __init amifb_init(void) | 2250 | static int __init amifb_init(void) |
2252 | { | 2251 | { |
2253 | int tag, i, err = 0; | 2252 | int tag, i, err = 0; |
2254 | u_long chipptr; | 2253 | u_long chipptr; |
@@ -3793,16 +3792,14 @@ static void ami_rebuild_copper(void) | |||
3793 | } | 3792 | } |
3794 | } | 3793 | } |
3795 | 3794 | ||
3796 | 3795 | static void __exit amifb_exit(void) | |
3797 | module_init(amifb_init); | ||
3798 | |||
3799 | #ifdef MODULE | ||
3800 | MODULE_LICENSE("GPL"); | ||
3801 | |||
3802 | void cleanup_module(void) | ||
3803 | { | 3796 | { |
3804 | unregister_framebuffer(&fb_info); | 3797 | unregister_framebuffer(&fb_info); |
3805 | amifb_deinit(); | 3798 | amifb_deinit(); |
3806 | amifb_video_off(); | 3799 | amifb_video_off(); |
3807 | } | 3800 | } |
3808 | #endif /* MODULE */ | 3801 | |
3802 | module_init(amifb_init); | ||
3803 | module_exit(amifb_exit); | ||
3804 | |||
3805 | MODULE_LICENSE("GPL"); | ||