2008-06-09 22:28:34

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] 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 <[email protected]>

---

drivers/video/amifb.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)

65ed788eed9849172f7dcf0522a4794e5ef3d804 diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 05a328c..6dea095 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
* Interface to the low level console driver
*/

-int amifb_init(void);
static void amifb_deinit(void);

/*
@@ -2245,7 +2244,7 @@ static inline void chipfree(void)
* Initialisation
*/

-int __init amifb_init(void)
+static int __init amifb_init(void)
{
int tag, i, err = 0;
u_long chipptr;
@@ -3787,16 +3786,14 @@ static void ami_rebuild_copper(void)
}
}

-
-module_init(amifb_init);
-
-#ifdef MODULE
-MODULE_LICENSE("GPL");
-
-void cleanup_module(void)
+static void __exit amifb_exit(void)
{
unregister_framebuffer(&fb_info);
amifb_deinit();
amifb_video_off();
}
-#endif /* MODULE */
+
+module_init(amifb_init);
+module_exit(amifb_exit);
+
+MODULE_LICENSE("GPL");