ALSA: hda - Allocate hda_pcm objects dynamically

So far, the hda_codec object kept the hda_pcm list in an array, and
the codec driver was expected to assign the array.  However, this
makes the object life cycle management harder, because the assigned
array is freed at the codec driver detach while it might be still
accessed by the opened streams.

In this patch, we allocate each hda_pcm object dynamically and manage
it as a linked list.  Each object has a kref refcount, and both the
codec driver binder and the PCM open/close touches it, so that the
object won't be freed while in use.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 13 insertions, 16 deletions

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index ced3e82d9e23..555781fad26f 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -719,7 +719,6 @@ struct ca0132_spec {
         unsigned int num_inputs;
         hda_nid_t shared_mic_nid;
         hda_nid_t shared_out_nid;
-        struct hda_pcm pcm_rec[5]; /* PCM information */
 
         /* chip access */
         struct mutex chipio_mutex; /* chip access mutex */
@@ -4036,12 +4035,11 @@ static struct hda_pcm_stream ca0132_pcm_digital_capture = {
 static int ca0132_build_pcms(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
+        struct hda_pcm *info;
 
-        codec->pcm_info = info;
-        codec->num_pcms = 0;
-
-        info->name = "CA0132 Analog";
+        info = snd_hda_codec_pcm_new(codec, "CA0132 Analog");
+        if (!info)
+                return -ENOMEM;
         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ca0132_pcm_analog_playback;
         info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->dacs[0];
         info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =
@@ -4049,27 +4047,27 @@ static int ca0132_build_pcms(struct hda_codec *codec)
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[0];
-        codec->num_pcms++;
 
-        info++;
-        info->name = "CA0132 Analog Mic-In2";
+        info = snd_hda_codec_pcm_new(codec, "CA0132 Analog Mic-In2");
+        if (!info)
+                return -ENOMEM;
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[1];
-        codec->num_pcms++;
 
-        info++;
-        info->name = "CA0132 What U Hear";
+        info = snd_hda_codec_pcm_new(codec, "CA0132 What U Hear");
+        if (!info)
+                return -ENOMEM;
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[2];
-        codec->num_pcms++;
 
         if (!spec->dig_out && !spec->dig_in)
                 return 0;
 
-        info++;
-        info->name = "CA0132 Digital";
+        info = snd_hda_codec_pcm_new(codec, "CA0132 Digital");
+        if (!info)
+                return -ENOMEM;
         info->pcm_type = HDA_PCM_TYPE_SPDIF;
         if (spec->dig_out) {
                 info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
@@ -4081,7 +4079,6 @@ static int ca0132_build_pcms(struct hda_codec *codec)
                         ca0132_pcm_digital_capture;
                 info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in;
         }
-        codec->num_pcms++;
 
         return 0;
 }