hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mengdong Lin 2015-11-23 11:03:52 -05:00 committed by Mark Brown
parent 923c5e61ec
commit 6f2f1ff0de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/soc-core.c
View File

@ -960,9 +960,9 @@ static struct snd_soc_dai *snd_soc_find_dai(
return NULL; 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_pcm_runtime *rtd;
struct snd_soc_dai_link_component *codecs = dai_link->codecs; struct snd_soc_dai_link_component *codecs = dai_link->codecs;
struct snd_soc_dai_link_component cpu_dai_component; 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; const char *platform_name;
int i; 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); rtd = soc_new_pcm_runtime(card, dai_link);
if (!rtd) if (!rtd)
@ -1710,7 +1710,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
/* bind DAIs */ /* bind DAIs */
for (i = 0; i < card->num_links; i++) { 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) if (ret != 0)
goto base_error; goto base_error;
} }