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

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

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/ip2main.c linux/drivers/char/ip2main.c
@@ -311,6 +311,7 @@
  * download the loadware to the boards.
  */
 static struct file_operations ip2_ipl = {
+	owner:		THIS_MODULE,
 	read:		ip2_ipl_read,
 	write:		ip2_ipl_write,
 	ioctl:		ip2_ipl_ioctl,
@@ -876,19 +877,19 @@
 #ifdef	CONFIG_DEVFS_FS
 			sprintf( name, "ipl%d", i );
 			i2BoardPtrTable[i]->devfs_ipl_handle =
-				devfs_register (devfs_handle, name, 0,
-					DEVFS_FL_NONE,
+				devfs_register (devfs_handle, name,
+					DEVFS_FL_DEFAULT,
 					IP2_IPL_MAJOR, 4 * i,
 					S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
-					0, 0, &ip2_ipl, NULL);
+					&ip2_ipl, NULL);
 
 			sprintf( name, "stat%d", i );
 			i2BoardPtrTable[i]->devfs_stat_handle =
-				devfs_register (devfs_handle, name, 0,
-					DEVFS_FL_NONE,
+				devfs_register (devfs_handle, name,
+					DEVFS_FL_DEFAULT,
 					IP2_IPL_MAJOR, 4 * i + 1,
 					S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
-					0, 0, &ip2_ipl, NULL);
+					&ip2_ipl, NULL);
 
 			for ( box = 0; box < ABS_MAX_BOXES; ++box )
 			{
@@ -3201,8 +3202,6 @@
 #ifdef IP2DEBUG_IPL
 	printk (KERN_DEBUG "IP2IPL: open\n" );
 #endif
-
-	//MOD_INC_USE_COUNT; // Needs close entry with decrement.
 
 	switch(iplminor) {
 	// These are the IPL devices

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)