From: Benoit Cousson Date: Tue, 1 Jul 2014 07:47:54 +0000 (+0200) Subject: ASoC: core: Change soc_link_dai_widgets signature for multiple codecs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3f901a028feb916d17d6c01b9010f3f56f675d26;p=linux-beck.git 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 Signed-off-by: Mark Brown --- 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, 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; }