patch-2.3.26 linux/drivers/char/adbmouse.c

• Lines: 38
• Date: Tue Nov 2 21:38:44 1999
• Orig file: v2.3.25/linux/drivers/char/adbmouse.c
• Orig date: Fri Oct 15 15:25:13 1999

diff -u --recursive --new-file v2.3.25/linux/drivers/char/adbmouse.c linux/drivers/char/adbmouse.c
@@ -148,7 +148,7 @@
 	ADB_MOUSE_MINOR, "adbmouse", open_mouse, release_mouse, 7
 };
 
-int __init adb_mouse_init(void)
+static int __init adb_mouse_init(void)
 {
 #ifdef __powerpc__
 	if ((_machine != _MACH_chrp) && (_machine != _MACH_Pmac))
@@ -170,6 +170,8 @@
 	return msedev < 0 ? msedev : 0;
 }
 
+#ifndef MODULE
+
 /*
  * XXX this function is misnamed.
  * It is called if the kernel is booted with the adb_buttons=xxx
@@ -193,15 +195,12 @@
 
 __setup("adb_buttons=", adb_mouse_setup);
 
-#ifdef MODULE
-int init_module(void)
-{
-	return adb_mouse_init();
-}
+#endif /* !MODULE */
 
-void cleanup_module(void)
+static void __exit adb_mouse_cleanup(void)
 {
 	unregister_busmouse(msedev);
 }
 
-#endif
+module_init(adb_mouse_init);
+module_exit(adb_mouse_cleanup);