patch-2.4.0-test2 linux/drivers/sbus/audio/audio.c

• Lines: 90
• Date: Thu Jun 22 07:21:12 2000
• Orig file: v2.4.0-test1/linux/drivers/sbus/audio/audio.c
• Orig date: Tue Mar 14 19:10:40 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/sbus/audio/audio.c linux/drivers/sbus/audio/audio.c
@@ -1,4 +1,4 @@
-/* $Id: audio.c,v 1.50 2000/03/13 03:54:07 davem Exp $
+/* $Id: audio.c,v 1.52 2000/06/22 11:42:27 davem Exp $
  * drivers/sbus/audio/audio.c
  *
  * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu)
@@ -87,8 +87,6 @@
 #include <linux/poll.h>
 #define COPY_IN(arg, get) get_user(get, (int *)arg)
 #define COPY_OUT(arg, ret) put_user(ret, (int *)arg)
-#define sparcaudio_release_ret sparcaudio_release
-#define sparcaudioctl_release_ret sparcaudioctl_release
 #define sparcaudio_select sparcaudio_poll
 
 #endif
@@ -1767,24 +1765,10 @@
 	return retval;
 }
 
-static int sparcaudioctl_release_ret(struct inode * inode, struct file * file)
-{
-        MOD_DEC_USE_COUNT;
-        return 0;
-}
-
-/* For 2.0 kernels */
-#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100
-static void sparcaudioctl_release(struct inode * inode, struct file * file)
-{
-        sparcaudioctl_release_ret(inode, file);
-}
-#endif
-
 static struct file_operations sparcaudioctl_fops = {
+	owner:		THIS_MODULE,
 	poll:		sparcaudio_select,
 	ioctl:		sparcaudio_ioctl,
-	release:	sparcaudioctl_release,
 };
 
 static int sparcaudio_open(struct inode * inode, struct file * file)
@@ -1917,13 +1901,11 @@
                 }          
         }
 
-	MOD_INC_USE_COUNT;
-
 	/* Success! */
 	return 0;
 }
 
-static int sparcaudio_release_ret(struct inode * inode, struct file * file)
+static int sparcaudio_release(struct inode * inode, struct file * file)
 {
         struct sparcaudio_driver *drv = drivers[(MINOR(inode->i_rdev) >>
                                                  SPARCAUDIO_DEVICE_SHIFT)];
@@ -1968,21 +1950,11 @@
         /* Status changed. Signal control device */
         kill_procs(drv->sd_siglist,SIGPOLL,S_MSG);
 
-        MOD_DEC_USE_COUNT;
-
         wake_up_interruptible(&drv->open_wait);
 
         return 0;
 }
 
-/* For 2.0 kernels */
-#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100
-static void sparcaudio_release(struct inode * inode, struct file * file)
-{
-        sparcaudio_release_ret(inode, file);
-}
-#endif
-
 static struct file_operations sparcaudio_fops = {
 	llseek:		sparcaudio_lseek,
 	read:		sparcaudio_read,
@@ -2038,9 +2010,9 @@
 	for (i=0; i < sizeof (dev_list) / sizeof (*dev_list); i++) {
 		sparcaudio_mkname (name_buf, dev_list[i].name, dev);
 		minor = (dev << SPARCAUDIO_DEVICE_SHIFT) | dev_list[i].minor;
-		devfs_register (devfs_handle, name_buf, 0, DEVFS_FL_NONE,
+		devfs_register (devfs_handle, name_buf, DEVFS_FL_NONE,
 				SOUND_MAJOR, minor, S_IFCHR | dev_list[i].mode,
-				0, 0, &sparcaudio_fops, NULL);
+				&sparcaudio_fops, NULL);
 	}
 
         /* Setup the circular queues of output and input buffers