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

• Lines: 59
• Date: Wed Jun 21 22:31:01 2000
• Orig file: v2.4.0-test1/linux/drivers/char/istallion.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/istallion.c linux/drivers/char/istallion.c
@@ -687,8 +687,6 @@
 
 static int	stli_brdinit(stlibrd_t *brdp);
 static int	stli_startbrd(stlibrd_t *brdp);
-static int	stli_memopen(struct inode *ip, struct file *fp);
-static int	stli_memclose(struct inode *ip, struct file *fp);
 static ssize_t	stli_memread(struct file *fp, char *buf, size_t count, loff_t *offp);
 static ssize_t	stli_memwrite(struct file *fp, const char *buf, size_t count, loff_t *offp);
 static int	stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg);
@@ -780,11 +778,10 @@
  *	board. This is also a very useful debugging tool.
  */
 static struct file_operations	stli_fsiomem = {
+	owner:		THIS_MODULE,
 	read:		stli_memread,
 	write:		stli_memwrite,
 	ioctl:		stli_memioctl,
-	open:		stli_memopen,
-	release:	stli_memclose,
 };
 
 /*****************************************************************************/
@@ -5183,27 +5180,6 @@
 /*****************************************************************************/
 
 /*
- *	Memory device open code. Need to keep track of opens and close
- *	for module handling.
- */
-
-static int stli_memopen(struct inode *ip, struct file *fp)
-{
-	MOD_INC_USE_COUNT;
-	return(0);
-}
-
-/*****************************************************************************/
-
-static int stli_memclose(struct inode *ip, struct file *fp)
-{
-	MOD_DEC_USE_COUNT;
-	return(0);
-}
-
-/*****************************************************************************/
-
-/*
  *	The "staliomem" device is also required to do some special operations on
  *	the board. We need to be able to send an interrupt to the board,
  *	reset it, and start/stop it.
@@ -5334,7 +5310,7 @@
 	devfs_handle = devfs_mk_dir (NULL, "staliomem", 9, NULL);
 	devfs_register_series (devfs_handle, "%u", 4, DEVFS_FL_DEFAULT,
 			       STL_SIOMEMMAJOR, 0,
-			       S_IFCHR | S_IRUSR | S_IWUSR, 0, 0,
+			       S_IFCHR | S_IRUSR | S_IWUSR,
 			       &stli_fsiomem, NULL);
 
 /*