diff options
| author | Benoit Cousson <bcousson@baylibre.com> | 2014-07-01 09:47:54 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 18:17:22 +0100 |
| commit | 3f901a028feb916d17d6c01b9010f3f56f675d26 (patch) | |
| tree | 676c0dc5db07086b6a12ecbeab20e014d8d503f8 /sound/soc | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| download | op-kernel-dev-3f901a028feb916d17d6c01b9010f3f56f675d26.zip op-kernel-dev-3f901a028feb916d17d6c01b9010f3f56f675d26.tar.gz | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b87d7d8..075e0ae 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, static int soc_link_dai_widgets(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link, - struct snd_soc_dai *cpu_dai, - struct snd_soc_dai *codec_dai) + struct snd_soc_pcm_runtime *rtd) { + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dapm_widget *play_w, *capture_w; int ret; @@ -1570,8 +1571,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) codec2codec_close_delayed_work); /* link the DAI widgets */ - ret = soc_link_dai_widgets(card, dai_link, - cpu_dai, codec_dai); + ret = soc_link_dai_widgets(card, dai_link, rtd); if (ret) return ret; } |
