patch-2.4.0-test2 linux/drivers/block/paride/pt.c

• Lines: 58
• Date: Wed Jun 21 22:31:00 2000
• Orig file: v2.4.0-test1/linux/drivers/block/paride/pt.c
• Orig date: Wed Feb 16 17:03:51 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/block/paride/pt.c linux/drivers/block/paride/pt.c
@@ -263,6 +263,7 @@
 /* kernel glue structures */
 
 static struct file_operations pt_fops = {
+	owner:		THIS_MODULE,
 	read:		pt_read,
 	write:		pt_write,
 	ioctl:		pt_ioctl,
@@ -313,10 +314,10 @@
 
 	devfs_handle = devfs_mk_dir (NULL, "pt", 2, NULL);
 	devfs_register_series (devfs_handle, "%u", 4, DEVFS_FL_DEFAULT,
-			       major, 0, S_IFCHR | S_IRUSR | S_IWUSR, 0, 0,
+			       major, 0, S_IFCHR | S_IRUSR | S_IWUSR,
 			       &pt_fops, NULL);
 	devfs_register_series (devfs_handle, "%un", 4, DEVFS_FL_DEFAULT,
-			       major, 128, S_IFCHR | S_IRUSR | S_IWUSR, 0, 0,
+			       major, 128, S_IFCHR | S_IRUSR | S_IWUSR,
 			       &pt_fops, NULL);
         return 0;
 }
@@ -701,19 +702,15 @@
 		return -EBUSY;
 	}
 
-        MOD_INC_USE_COUNT;
-
 	pt_identify(unit);
 
 	if (!PT.flags & PT_MEDIA) {
 		PT.access--;
-		MOD_DEC_USE_COUNT;
 		return -ENODEV;
 		}
 
 	if ((!PT.flags & PT_WRITE_OK) && (file ->f_mode & 2)) {
 		PT.access--;
-		MOD_DEC_USE_COUNT;
 		return -EROFS;
 		}
 
@@ -723,7 +720,6 @@
 	PT.bufptr = kmalloc(PT_BUFSIZE,GFP_KERNEL);
 	if (PT.bufptr == NULL) {
 		PT.access--;
-		MOD_DEC_USE_COUNT;
 		printk("%s: buffer allocation failed\n",PT.name);
 		return -ENOMEM;
 	}
@@ -785,8 +781,6 @@
 
 	kfree(PT.bufptr);
 	PT.bufptr = NULL;
-
-        MOD_DEC_USE_COUNT;
 
 	return 0;