patch-2.3.43 linux/drivers/sound/cmpci.c

Next file: linux/drivers/sound/dev_table.c
Previous file: linux/drivers/sound/ac97_codec.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/drivers/sound/cmpci.c linux/drivers/sound/cmpci.c
@@ -1180,19 +1180,10 @@
 }
 
 static /*const*/ struct file_operations cm_mixer_fops = {
-	&cm_llseek,
-	NULL,  /* read */
-	NULL,  /* write */
-	NULL,  /* readdir */
-	NULL,  /* poll */
-	&cm_ioctl_mixdev,
-	NULL,  /* mmap */
-	&cm_open_mixdev,
-	NULL,	/* flush */
-	&cm_release_mixdev,
-	NULL,  /* fsync */
-	NULL,  /* fasync */
-	NULL,  /* lock */
+	llseek:		cm_llseek,
+	ioctl:		cm_ioctl_mixdev,
+	open:		cm_open_mixdev,
+	release:	cm_release_mixdev,
 };
 
 /* --------------------------------------------------------------------- */
@@ -1801,19 +1792,14 @@
 }
 
 static /*const*/ struct file_operations cm_audio_fops = {
-	&cm_llseek,
-	&cm_read,
-	&cm_write,
-	NULL,  /* readdir */
-	&cm_poll,
-	&cm_ioctl,
-	&cm_mmap,
-	&cm_open,
-	NULL,	/* flush */
-	&cm_release,
-	NULL,  /* fsync */
-	NULL,  /* fasync */
-	NULL,  /* lock */
+	llseek:		cm_llseek,
+	read:		cm_read,
+	write:		cm_write,
+	poll:		cm_poll,
+	ioctl:		cm_ioctl,
+	mmap:		cm_mmap,
+	open:		cm_open,
+	release:	cm_release,
 };
 
 /* --------------------------------------------------------------------- */
@@ -2080,19 +2066,12 @@
 }
 
 static /*const*/ struct file_operations cm_midi_fops = {
-	&cm_llseek,
-	&cm_midi_read,
-	&cm_midi_write,
-	NULL,  /* readdir */
-	&cm_midi_poll,
-	NULL,  /* ioctl */
-	NULL,  /* mmap */
-	&cm_midi_open,
-	NULL,	/* flush */
-	&cm_midi_release,
-	NULL,  /* fsync */
-	NULL,  /* fasync */
-	NULL,  /* lock */
+	llseek:		cm_llseek,
+	read:		cm_midi_read,
+	write:		cm_midi_write,
+	poll:		cm_midi_poll,
+	open:		cm_midi_open,
+	release:	cm_midi_release,
 };
 
 /* --------------------------------------------------------------------- */
@@ -2252,19 +2231,10 @@
 }
 
 static /*const*/ struct file_operations cm_dmfm_fops = {
-	&cm_llseek,
-	NULL,  /* read */
-	NULL,  /* write */
-	NULL,  /* readdir */
-	NULL,  /* poll */
-	&cm_dmfm_ioctl,
-	NULL,  /* mmap */
-	&cm_dmfm_open,
-	NULL,	/* flush */
-	&cm_dmfm_release,
-	NULL,  /* fsync */
-	NULL,  /* fasync */
-	NULL,  /* lock */
+	llseek:		cm_llseek,
+	ioctl:		cm_dmfm_ioctl,
+	open:		cm_dmfm_open,
+	release:	cm_dmfm_release,
 };
 
 /* --------------------------------------------------------------------- */

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