commit 2af677fc884fc6dc79e65c99050ea607ac8bab9b
author Clemens Ladisch <clemens@ladisch.de> Sun Nov 20 14:03:48 2005 +0100
committer Jaroslav Kysela <perex@suse.cz> Tue Jan 03 12:29:14 2006 +0100
tree 4291d36c2f116d5887b88da5f0213b68933a1201
parent a106cd3d9e88c8761bd0eac2ce402cc82bd11fea

[ALSA] dynamic minors (1/6): store device type in struct snd_minor

Instead of a comment string, store the device type in the snd_minor
structure.  This makes snd_minor more flexible, and has the nice side
effect that we don't need anymore to create a separate snd_minor
template for registering a device but can pass the file_operations
directly to snd_register_device().

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

sound/core/pcm.c

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 9305ac3..2bc5f69e 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -597,7 +597,6 @@
 	pstr->stream = stream;
 	pstr->pcm = pcm;
 	pstr->substream_count = substream_count;
-	pstr->reg = &snd_pcm_reg[stream];
 	if (substream_count > 0) {
 		err = snd_pcm_stream_proc_init(pstr);
 		if (err < 0) {
@@ -897,7 +896,10 @@
 			devtype = SNDRV_DEVICE_TYPE_PCM_CAPTURE;
 			break;
 		}
-		if ((err = snd_register_device(devtype, pcm->card, pcm->device, pcm->streams[cidx].reg, str)) < 0) {
+		if ((err = snd_register_device(devtype, pcm->card,
+					       pcm->device,
+					       &snd_pcm_f_ops[cidx], str)) < 0)
+		{
 			snd_pcm_devices[idx] = NULL;
 			up(&register_mutex);
 			return err;