aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Cousson <bcousson@baylibre.com>2014-07-01 03:47:54 -0400
committerMark Brown <broonie@linaro.org>2014-07-01 13:17:22 -0400
commit3f901a028feb916d17d6c01b9010f3f56f675d26 (patch)
tree676c0dc5db07086b6a12ecbeab20e014d8d503f8
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
ASoC: core: Change soc_link_dai_widgets signature for multiple codecs
Since multiple codecs DAI will be usable in the future, remove explicit unique codec_dai and cpu_dai parameters. Replace them with snd_soc_pcm_runtime pointer that will contain every instances. No functionale change. Signed-off-by: Benoit Cousson <bcousson@baylibre.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/soc-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b87d7d882e6d..075e0ae5fade 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1450,9 +1450,10 @@ static int soc_probe_codec_dai(struct snd_soc_card *card,
1450 1450
1451static int soc_link_dai_widgets(struct snd_soc_card *card, 1451static int soc_link_dai_widgets(struct snd_soc_card *card,
1452 struct snd_soc_dai_link *dai_link, 1452 struct snd_soc_dai_link *dai_link,
1453 struct snd_soc_dai *cpu_dai, 1453 struct snd_soc_pcm_runtime *rtd)
1454 struct snd_soc_dai *codec_dai)
1455{ 1454{
1455 struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
1456 struct snd_soc_dai *codec_dai = rtd->codec_dai;
1456 struct snd_soc_dapm_widget *play_w, *capture_w; 1457 struct snd_soc_dapm_widget *play_w, *capture_w;
1457 int ret; 1458 int ret;
1458 1459
@@ -1570,8 +1571,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
1570 codec2codec_close_delayed_work); 1571 codec2codec_close_delayed_work);
1571 1572
1572 /* link the DAI widgets */ 1573 /* link the DAI widgets */
1573 ret = soc_link_dai_widgets(card, dai_link, 1574 ret = soc_link_dai_widgets(card, dai_link, rtd);
1574 cpu_dai, codec_dai);
1575 if (ret) 1575 if (ret)
1576 return ret; 1576 return ret;
1577 } 1577 }