From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [alsa-devel] [PATCH resend 07/11] ASoC: soc-core: self contained soc_probe_link_dais()
Date: 04 Sep 2019 09:15:17 +0900 [thread overview]
Message-ID: <87woeoor1m.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <877e6oq5nv.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Current soc_probe_link_dais() implementation is very half,
thus it is very difficult to read.
for_each_comp_order(xxx) {
for_each_card_rtds(xxx)
=> soc_probe_link_dais(xxx);
}
This patch does all for_each_xxx() under soc_probe_link_dais(),
and makes it to self contained.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-core.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1e74ab8..36b86e3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1452,25 +1452,30 @@ static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
return 0;
}
-static int soc_probe_link_dais(struct snd_soc_card *card,
- struct snd_soc_pcm_runtime *rtd, int order)
+static int soc_probe_link_dais(struct snd_soc_card *card)
{
- struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
- int i, ret;
+ struct snd_soc_pcm_runtime *rtd;
+ int i, order, ret;
- dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n",
- card->name, rtd->num, order);
+ for_each_comp_order(order) {
+ for_each_card_rtds(card, rtd) {
- ret = soc_probe_dai(cpu_dai, order);
- if (ret)
- return ret;
+ dev_dbg(card->dev,
+ "ASoC: probe %s dai link %d late %d\n",
+ card->name, rtd->num, order);
- /* probe the CODEC DAI */
- for_each_rtd_codec_dai(rtd, i, codec_dai) {
- ret = soc_probe_dai(codec_dai, order);
- if (ret)
- return ret;
+ ret = soc_probe_dai(rtd->cpu_dai, order);
+ if (ret)
+ return ret;
+
+ /* probe the CODEC DAI */
+ for_each_rtd_codec_dai(rtd, i, codec_dai) {
+ ret = soc_probe_dai(codec_dai, order);
+ if (ret)
+ return ret;
+ }
+ }
}
return 0;
@@ -1933,7 +1938,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd;
struct snd_soc_dai_link *dai_link;
struct snd_soc_aux_dev *aux;
- int ret, i, order;
+ int ret, i;
mutex_lock(&client_mutex);
for_each_card_prelinks(card, i, dai_link) {
@@ -2034,16 +2039,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
}
/* probe all DAI links on this card */
- for_each_comp_order(order) {
- for_each_card_rtds(card, rtd) {
- ret = soc_probe_link_dais(card, rtd, order);
- if (ret < 0) {
- dev_err(card->dev,
- "ASoC: failed to instantiate card %d\n",
- ret);
- goto probe_end;
- }
- }
+ ret = soc_probe_link_dais(card);
+ if (ret < 0) {
+ dev_err(card->dev,
+ "ASoC: failed to instantiate card %d\n", ret);
+ goto probe_end;
}
for_each_card_rtds(card, rtd)
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-09-04 0:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 0:14 [alsa-devel] [PATCH resend 00/11] ASoC: soc-core cleanup Kuninori Morimoto
2019-09-04 0:14 ` [alsa-devel] [PATCH resend 01/11] ASoC: soc-core: add comment to jack at soc_remove_component() Kuninori Morimoto
2019-09-04 17:53 ` [alsa-devel] Applied "ASoC: soc-core: add comment to jack at soc_remove_component()" to the asoc tree Mark Brown
2019-09-04 0:14 ` [alsa-devel] [PATCH resend 02/11] ASoC: soc-core: self contained soc_probe_link_components() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: self contained soc_probe_link_components()" to the asoc tree Mark Brown
2019-09-04 0:14 ` [alsa-devel] [PATCH resend 03/11] ASoC: soc-core: self contained soc_remove_link_components() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: self contained soc_remove_link_components()" to the asoc tree Mark Brown
2019-09-04 0:14 ` [alsa-devel] [PATCH resend 04/11] ASoC: soc-core: self contained soc_remove_link_dais() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: self contained soc_remove_link_dais()" to the asoc tree Mark Brown
2019-09-04 0:15 ` [alsa-devel] [PATCH resend 05/11] ASoC: soc-core: move soc_probe_dai() next to soc_remove_dai() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: move soc_probe_dai() next to soc_remove_dai()" to the asoc tree Mark Brown
2019-09-04 0:15 ` [alsa-devel] [PATCH resend 06/11] ASoC: soc-core: add new soc_link_init() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: add new soc_link_init()" to the asoc tree Mark Brown
2019-09-04 0:15 ` Kuninori Morimoto [this message]
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: self contained soc_probe_link_dais()" " Mark Brown
2019-09-04 0:15 ` [alsa-devel] [PATCH resend 08/11] ASoC: soc-core: move soc_probe_link_dais() next to soc_remove_link_dais() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: move soc_probe_link_dais() next to soc_remove_link_dais()" to the asoc tree Mark Brown
2019-09-04 0:15 ` [alsa-devel] [PATCH resend 09/11] ASoC: soc-core: self contained soc_bind_aux_dev() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: self contained soc_bind_aux_dev()" to the asoc tree Mark Brown
2019-09-04 0:15 ` [alsa-devel] [PATCH resend 10/11] ASoC: soc-core: add soc_unbind_aux_dev() Kuninori Morimoto
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: add soc_unbind_aux_dev()" to the asoc tree Mark Brown
2019-09-04 0:15 ` [alsa-devel] [PATCH resend 11/11] ASoC: soc-core: self contained soc_unbind_aux_dev() Kuninori Morimoto
2019-09-09 9:59 ` Mark Brown
2019-09-09 10:07 ` [alsa-devel] Applied "ASoC: soc-core: self contained soc_unbind_aux_dev()" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87woeoor1m.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).