| Message ID | 1404200881-32253-2-git-send-email-bcousson@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3f901a028feb916d17d6c01b9010f3f56f675d26 |
| Headers | show |
On Tue, Jul 01, 2014 at 09:47:54AM +0200, Benoit Cousson wrote: > 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. Applied, thanks.
Hi Mark, On 01/07/2014 19:17, Mark Brown wrote: > On Tue, Jul 01, 2014 at 09:47:54AM +0200, Benoit Cousson wrote: >> 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. > > Applied, thanks. Where did you applied this patch and the next one? I couldn't find them during the rebase. Neither in asoc/for-next nor in topic/multicodec. Thanks, Benoit
On Fri, Jul 04, 2014 at 06:13:38PM +0200, Benoit Cousson wrote: > Where did you applied this patch and the next one? I couldn't find them > during the rebase. Neither in asoc/for-next nor in topic/multicodec. topic/multi.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 19c1e958..37a965c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1448,9 +1448,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; @@ -1565,8 +1566,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; }
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> --- sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)