patch-2.4.0-test2 linux/drivers/char/tpqic02.c

• Lines: 83
• Date: Wed Jun 21 22:31:01 2000
• Orig file: v2.4.0-test1/linux/drivers/char/tpqic02.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/tpqic02.c linux/drivers/char/tpqic02.c
@@ -2177,10 +2177,6 @@
     int open_error;
 
     open_error = qic02_tape_open_no_use_count(inode, filp);
-    if (!open_error)
-    {
-	MOD_INC_USE_COUNT;
-    }
     return open_error;
 }
 
@@ -2440,9 +2436,6 @@
 	    (void) do_qic_cmd(QCMD_REWIND, TIM_R);
 	}
     }
-#ifdef MODULE
-    MOD_DEC_USE_COUNT;
-#endif
     return 0;
 } /* qic02_tape_release */
 
@@ -2766,6 +2759,7 @@
 
 /* These are (most) of the interface functions: */
 static struct file_operations qic02_tape_fops = {
+	owner:		THIS_MODULE,
 	llseek:		qic02_tape_lseek,	/* not allowed */
 	read:		qic02_tape_read,
 	write:		qic02_tape_write,
@@ -2911,37 +2905,37 @@
 #endif
 	return -ENODEV;
     }
-    devfs_register (NULL, "ntpqic11", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "ntpqic11", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 2,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "tpqic11", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "tpqic11", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 3,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "ntpqic24", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "ntpqic24", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 4,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "tpqic24", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "tpqic24", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 5,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "ntpqic120", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "ntpqic120", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 6,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "tpqic120", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "tpqic120", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 7,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "ntpqic150", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "ntpqic150", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 8,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
-    devfs_register (NULL, "tpqic150", 0, DEVFS_FL_NONE,
+    devfs_register (NULL, "tpqic150", DEVFS_FL_DEFAULT,
 		    QIC02_TAPE_MAJOR, 9,
-		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP, 0, 0,
+		    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		    &qic02_tape_fops, NULL);
     init_waitqueue_head(&qic02_tape_transfer);
     /* prepare timer */