ASoC: Change 2nd argument of soc_bind_dai_link() to DAI link pointer
authorMengdong Lin <mengdong.lin@linux.intel.com>
Mon, 23 Nov 2015 16:03:52 +0000 (11:03 -0500)
committerMark Brown <broonie@kernel.org>
Wed, 25 Nov 2015 17:57:04 +0000 (17:57 +0000)
Just code refactoring, to reuse it if new DAI Links are added later
based on topology in component probing phase.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index 2ecd09475d88a21e321f808a9456c47406b97314..878a9fe9268685c4ad0bfd7ca4d8ec14db7898a1 100644 (file)
@@ -960,9 +960,9 @@ static struct snd_soc_dai *snd_soc_find_dai(
        return NULL;
 }
 
-static int soc_bind_dai_link(struct snd_soc_card *card, int num)
+static int soc_bind_dai_link(struct snd_soc_card *card,
+       struct snd_soc_dai_link *dai_link)
 {
-       struct snd_soc_dai_link *dai_link = &card->dai_link[num];
        struct snd_soc_pcm_runtime *rtd;
        struct snd_soc_dai_link_component *codecs = dai_link->codecs;
        struct snd_soc_dai_link_component cpu_dai_component;
@@ -971,7 +971,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
        const char *platform_name;
        int i;
 
-       dev_dbg(card->dev, "ASoC: binding %s at idx %d\n", dai_link->name, num);
+       dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name);
 
        rtd = soc_new_pcm_runtime(card, dai_link);
        if (!rtd)
@@ -1710,7 +1710,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
 
        /* bind DAIs */
        for (i = 0; i < card->num_links; i++) {
-               ret = soc_bind_dai_link(card, i);
+               ret = soc_bind_dai_link(card, &card->dai_link[i]);
                if (ret != 0)
                        goto base_error;
        }