topology: Define a function to build a single PCM element

Code refactoring. Rename tplg_build_pcm() to tplg_build_pcms() to build
all PCM (FE DAI & DAI link) elements. It will call a new function
build_pcm() to build a single PCM elemement.

build_pcm() will be extended to handle more properties of a PCM.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/topology/parser.c b/src/topology/parser.c
index 3ab64f4fc02df559c6adfd9cf84dea3c07d96aea..7b2c87993a2b1d356c36a8614fad18bb718af5db 100644 (file)
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -267,7 +267,7 @@ static int tplg_build_integ(snd_tplg_t *tplg)
        if (err <  0)
                return err;
 
-       err = tplg_build_pcm(tplg, SND_TPLG_TYPE_PCM);
+       err = tplg_build_pcms(tplg, SND_TPLG_TYPE_PCM);
        if (err <  0)
                return err;
 

diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index bd70dc9596d4973c90044dcbfa736a7022035e62..77b760566d8cb06c71328afd4efa9279f7c62041 100644 (file)
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -70,8 +70,20 @@ static int tplg_build_stream_caps(snd_tplg_t *tplg,
        return 0;
 }
 
-/* build FE DAI/PCM configurations */
-int tplg_build_pcm(snd_tplg_t *tplg, unsigned int type)
+/* build a PCM (FE DAI & DAI link) element */
+static int build_pcm(snd_tplg_t *tplg, struct tplg_elem *elem)
+{
+       int err;
+
+       err = tplg_build_stream_caps(tplg, elem->id, elem->pcm->caps);
+               if (err < 0)
+                       return err;
+
+       return 0;
+}
+
+/* build all PCM (FE DAI & DAI link) elements */
+int tplg_build_pcms(snd_tplg_t *tplg, unsigned int type)
 {
        struct list_head *base, *pos;
        struct tplg_elem *elem;
@@ -86,7 +98,7 @@ int tplg_build_pcm(snd_tplg_t *tplg, unsigned int type)
                        return -EINVAL;
                }
 
-               err = tplg_build_stream_caps(tplg, elem->id, elem->pcm->caps);
+               err = build_pcm(tplg, elem);
                if (err < 0)
                        return err;
 

diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index cfde4cc5a4196aa10d7b83f6be80650fa215c188..7b30b8497b1511ecda14504e6c961ebf21ca9b04 100644 (file)
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -284,7 +284,7 @@ int tplg_add_enum(snd_tplg_t *tplg, struct snd_tplg_enum_template *enum_ctl,
 int tplg_add_bytes(snd_tplg_t *tplg, struct snd_tplg_bytes_template *bytes_ctl,
                   struct tplg_elem **e);
 
-int tplg_build_pcm(snd_tplg_t *tplg, unsigned int type);
+int tplg_build_pcms(snd_tplg_t *tplg, unsigned int type);
 int tplg_build_link_cfg(snd_tplg_t *tplg, unsigned int type);
 int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);
 int tplg_add_pcm_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);