diff mbox

[v2,03/10] ASoC: Change 2nd argument of soc_bind_dai_link() to DAI link pointer

Message ID f54bb3de97d8ac8af82b7c1ef1e210fa295cc92e.1439217448.git.mengdong.lin@intel.com
State New, archived
Headers show

Commit Message

Lin, Mengdong Aug. 10, 2015, 2:47 p.m. UTC
From: Mengdong Lin <mengdong.lin@intel.com>

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@intel.com>
diff mbox


diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e9e8956..ddfdd1d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -961,9 +961,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;
@@ -972,7 +972,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);
 	if (snd_soc_get_pcm_runtime(card, dai_link->name)) {
 		dev_dbg(card->dev, "ASoC: dai link %s already bound\n",
@@ -1717,7 +1717,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;