patch-2.4.0-test2 linux/drivers/sbus/char/jsflash.c

• Lines: 54
• Date: Thu Jun 22 07:21:12 2000
• Orig file: v2.4.0-test1/linux/drivers/sbus/char/jsflash.c
• Orig date: Wed Apr 26 16:34:08 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/sbus/char/jsflash.c linux/drivers/sbus/char/jsflash.c
@@ -271,7 +271,7 @@
 }
 
 /*
- * P3: OS SIMM Cannot be read in other size but a 32bits word.
+ * OS SIMM Cannot be read in other size but a 32bits word.
  */
 static ssize_t jsf_read(struct file * file, char * buf, 
     size_t togo, loff_t *ppos)
@@ -479,7 +479,6 @@
 	if (test_and_set_bit(0, (void *)&jsf0.busy) != 0)
 		return -EBUSY;
 
-	MOD_INC_USE_COUNT;
 	return 0;	/* XXX What security? */
 }
 
@@ -505,9 +504,6 @@
 
 static int jsf_release(struct inode *inode, struct file *file)
 {
-
-	MOD_DEC_USE_COUNT;
-
 	jsf0.busy = 0;
 	return 0;
 }
@@ -537,6 +533,7 @@
 }
 
 static struct file_operations jsf_fops = {
+	owner:		THIS_MODULE,
 	llseek:		jsf_lseek,
 	read:		jsf_read,
 	write:		jsf_write,
@@ -650,8 +647,7 @@
 	int i;
 
 	if (jsf0.base == 0) {
-		printk("jsfd_init: no flash\n"); /* P3 */
-		return -EIO;
+		return -ENXIO;
 	}
 
 	if (register_blkdev(JSFD_MAJOR, "jsfd", &jsfd_fops)) {
@@ -659,8 +655,6 @@
 		    JSFD_MAJOR);
 		return -EIO;
 	}
-
-	printk("jsfd0: at major %d\n", MAJOR_NR); /* P3 */
 
 	blksize_size[JSFD_MAJOR] = jsfd_blksizes;
 	blk_size[JSFD_MAJOR] = jsfd_sizes;