patch-1.3.39 linux/drivers/char/msbusmouse.c

Next file: linux/drivers/char/psaux.c
Previous file: linux/drivers/char/mem.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.38/linux/drivers/char/msbusmouse.c linux/drivers/char/msbusmouse.c
@@ -30,16 +30,7 @@
  * version 0.3b
  */
 
-#ifdef MODULE
 #include <linux/module.h>
-#include <linux/version.h>
-
-char kernel_version[] = UTS_RELEASE;
-#define ms_bus_mouse_init init_module
-#else
-#define MOD_INC_USE_COUNT
-#define MOD_DEC_USE_COUNT
-#endif
 
 #include <linux/kernel.h>
 #include <linux/ioport.h>
@@ -219,12 +210,13 @@
 }
 
 #ifdef MODULE
+int init_module(void)
+{
+	return ms_bus_mouse_init();
+}
+
 void cleanup_module(void)
 {
-	if (MOD_IN_USE) {
-		printk("msbusmouse: in use, remove delayed\n");
-		return;
-	}
 	mouse_deregister(&ms_bus_mouse);
 	release_region(MS_MSE_CONTROL_PORT, 0x04);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this