patch-2.3.43 linux/drivers/sbus/audio/audio.c

• Lines: 54
• Date: Wed Feb 9 19:39:04 2000
• Orig file: v2.3.42/linux/drivers/sbus/audio/audio.c
• Orig date: Wed Dec 29 13:13:17 1999

diff -u --recursive --new-file v2.3.42/linux/drivers/sbus/audio/audio.c linux/drivers/sbus/audio/audio.c
@@ -1,4 +1,4 @@
-/* $Id: audio.c,v 1.47 1999/12/15 22:30:16 davem Exp $
+/* $Id: audio.c,v 1.48 2000/02/09 22:33:19 davem Exp $
  * drivers/sbus/audio/audio.c
  *
  * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu)
@@ -1959,18 +1959,9 @@
 #endif
 
 static struct file_operations sparcaudioctl_fops = {
-        NULL,
-        NULL,
-        NULL,
-        NULL,                   /* sparcaudio_readdir */
-        sparcaudio_select,
-        sparcaudio_ioctl,
-        NULL,                   /* sparcaudio_mmap */
-        NULL,
-#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE > 0x200ff
-        NULL,                   /* sparcaudio_flush */
-#endif
-        sparcaudioctl_release,
+	poll:		sparcaudio_select,
+	ioctl:		sparcaudio_ioctl,
+	release:	sparcaudioctl_release,
 };
 
 static int sparcaudio_open(struct inode * inode, struct file * file)
@@ -2170,18 +2161,13 @@
 #endif
 
 static struct file_operations sparcaudio_fops = {
-	sparcaudio_lseek,
-	sparcaudio_read,
-	sparcaudio_write,
-	NULL,			/* sparcaudio_readdir */
-	sparcaudio_select,
-	sparcaudio_ioctl,
-	NULL,			/* sparcaudio_mmap */
-	sparcaudio_open,
-#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE > 0x200ff
-        NULL,                   /* sparcaudio_flush */
-#endif
-	sparcaudio_release
+	llseek:		sparcaudio_lseek,
+	read:		sparcaudio_read,
+	write:		sparcaudio_write,
+	poll:		sparcaudio_select,
+	ioctl:		sparcaudio_ioctl,
+	open:		sparcaudio_open,
+	release:	sparcaudio_release,
 };
 
 #if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100