patch-2.2.18 linux/drivers/macintosh/adb.c

• Lines: 47
• Date: Wed Nov 8 23:00:34 2000
• Orig file: v2.2.17/drivers/macintosh/adb.c
• Orig date: Sat Sep 9 18:42:38 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/macintosh/adb.c linux/drivers/macintosh/adb.c
@@ -25,13 +25,13 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/notifier.h>
+#include <linux/init.h>
 #include <asm/prom.h>
 #include <asm/adb.h>
 #include <asm/cuda.h>
 #include <asm/pmu.h>
 #include <asm/uaccess.h>
 #include <asm/hydra.h>
-#include <asm/init.h>
 
 EXPORT_SYMBOL(adb_controller);
 EXPORT_SYMBOL(adb_client_list);
@@ -390,7 +390,7 @@
 
 #define ADB_MAJOR	56	/* major number for /dev/adb */
 
-extern void adbdev_init(void);
+extern int adbdev_init(void);
 
 struct adbdev_state {
 	spinlock_t	lock;
@@ -601,10 +601,19 @@
 	adb_release
 };
 
-void adbdev_init()
+static int __init adbdev_init(void)
 {
-	if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
-		return;		
+	if (adb_controller == NULL)
+		return 0;
 	if (register_chrdev(ADB_MAJOR, "adb", &adb_fops))
 		printk(KERN_ERR "adb: unable to get major %d\n", ADB_MAJOR);
+	return 0;
 }
+
+static void adbdev_cleanup(void)
+{
+	unregister_chrdev(ADB_MAJOR, "adb");
+}
+
+module_init(adbdev_init);
+module_exit(adbdev_cleanup);