Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f2f1ff0 authored by Mengdong Lin's avatar Mengdong Lin Committed by Mark Brown
Browse files

ASoC: Change 2nd argument of soc_bind_dai_link() to DAI link pointer 



Just code refactoring, to reuse it if new DAI Links are added later
based on topology in component probing phase.

Signed-off-by: default avatarMengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 923c5e61

sound/soc/soc-core.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}