[alsa-devel] Applied "ASoC: soc-core: tidyup soc_bind_dai_link() comment balance" to the asoc tree
Mark Brown
broonie at kernel.org
Mon May 13 14:30:27 CEST 2019
The patch
ASoC: soc-core: tidyup soc_bind_dai_link() comment balance
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From e2b30edfb9435879dc68cdb7ce20299492012101 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date: Mon, 13 May 2019 16:06:44 +0900
Subject: [PATCH] ASoC: soc-core: tidyup soc_bind_dai_link() comment balance
Many code at soc_bind_dai_link() was changed, and its comment is
now a little bit anbalanced.
This patch tidyup these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Signed-off-by: Mark Brown <broonie at kernel.org>
---
sound/soc/soc-core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2ceca7fdf622..c80e7df3b20b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -906,9 +906,8 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
}
snd_soc_rtdcom_add(rtd, rtd->cpu_dai->component);
- rtd->num_codecs = dai_link->num_codecs;
-
/* Find CODEC from registered CODECs */
+ rtd->num_codecs = dai_link->num_codecs;
for_each_link_codecs(dai_link, i, codecs) {
rtd->codec_dais[i] = snd_soc_find_dai(codecs);
if (!rtd->codec_dais[i]) {
@@ -922,7 +921,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
/* Single codec links expect codec and codec_dai in runtime data */
rtd->codec_dai = rtd->codec_dais[0];
- /* find one from the set of registered platforms */
+ /* Find PLATFORM from registered PLATFORMs */
for_each_component(component) {
if (!snd_soc_is_matching_component(dai_link->platforms,
component))
--
2.20.1
More information about the Alsa-devel
mailing list