All of lore.kernel.org
 help / color / mirror / Atom feed
From: mengdong.lin@linux.intel.com
To: alsa-devel@alsa-project.org, broonie@kernel.org
Cc: Mengdong Lin <mengdong.lin@linux.intel.com>,
	tiwai@suse.de, mengdong.lin@intel.com,
	liam.r.girdwood@linux.intel.com, vinod.koul@intel.com,
	jeeja.kp@intel.com, subhransu.s.prusty@intel.com
Subject: [PATCH v2 07/13] ASoC: soc_bind_dai_link() directly returns success for a bound DAI link
Date: Thu,  5 Nov 2015 17:59:19 +0800	[thread overview]
Message-ID: <9cb8b4b46674b6688c92bf9c22f0cd9db1b86dff.1446717205.git.mengdong.lin@linux.intel.com> (raw)
In-Reply-To: <cover.1446717205.git.mengdong.lin@linux.intel.com>

From: Mengdong Lin <mengdong.lin@linux.intel.com>

This function will return success immediately for a bound DAI link.
No need to look for the cpu/codec DAIs again.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 24e0c50..86c3219 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -960,6 +960,19 @@ static struct snd_soc_dai *snd_soc_find_dai(
 	return NULL;
 }
 
+static bool soc_is_dai_link_bound(struct snd_soc_card *card,
+		struct snd_soc_dai_link *dai_link)
+{
+	struct snd_soc_pcm_runtime *rtd;
+
+	list_for_each_entry(rtd, &card->rtd_list, list) {
+		if (rtd->dai_link == dai_link)
+			return true;
+	}
+
+	return false;
+}
+
 static int soc_bind_dai_link(struct snd_soc_card *card,
 	struct snd_soc_dai_link *dai_link)
 {
@@ -977,6 +990,12 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
 	if (!rtd)
 		return -ENOMEM;
 
+	if (soc_is_dai_link_bound(card, dai_link)) {
+		dev_dbg(card->dev, "ASoC: dai link %s already bound\n",
+			dai_link->name);
+		return 0;
+	}
+
 	cpu_dai_component.name = dai_link->cpu_name;
 	cpu_dai_component.of_node = dai_link->cpu_of_node;
 	cpu_dai_component.dai_name = dai_link->cpu_dai_name;
-- 
1.9.1

  parent reply	other threads:[~2015-11-05  9:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-05  9:58 [PATCH v2 00/13] ASoC: topology: Add support for PCM, BE & CC links mengdong.lin
2015-11-05  9:58 ` [PATCH v2 01/13] ASoC: Vendor drivers get a link's runtime by snd_soc_get_pcm_runtime() mengdong.lin
2015-11-05  9:58 ` [PATCH v2 02/13] ASoC: Change the PCM runtime array to a list mengdong.lin
2015-11-05  9:58 ` [PATCH v2 03/13] ASoC: Define soc_init_dai_link() to wrap link intialization mengdong.lin
2015-11-05  9:58 ` [PATCH v2 04/13] ASoC: Change 2nd argument of soc_bind_dai_link() to DAI link pointer mengdong.lin
2015-11-25 17:57   ` Applied "ASoC: Change 2nd argument of soc_bind_dai_link() to DAI link pointer" to the asoc tree Mark Brown
2015-11-05  9:59 ` [PATCH v2 05/13] ASoC: Implement DAI links in a list & define API to add a link mengdong.lin
2015-11-05  9:59 ` [PATCH v2 06/13] ASoC: Add add_dai_link ops for a soc card mengdong.lin
2015-11-05  9:59 ` mengdong.lin [this message]
2015-12-08 19:11   ` Applied "ASoC: soc_bind_dai_link() directly returns success for a bound DAI link" to the asoc tree Mark Brown
2015-11-05  9:59 ` [PATCH v2 08/13] ASoC: Bind new DAI links after probing components mengdong.lin
2015-12-08 19:11   ` Applied "ASoC: Bind new DAI links after probing components" to the asoc tree Mark Brown
2015-11-05  9:59 ` [PATCH v2 09/13] ASoC: The soc card can have auxiliary components mengdong.lin
2015-11-26 12:57   ` Lars-Peter Clausen
2015-11-05  9:59 ` [PATCH v2 10/13] ASoC: Support adding a DAI dynamically mengdong.lin
2015-11-05  9:59 ` [PATCH v2 11/13] ASoC: topology: Add PCM DAIs dynamically when loading them mengdong.lin
2015-11-05 10:00 ` [PATCH v2 12/13] ASoC: topology: Add support for FE DAI links mengdong.lin
2015-11-05 10:00 ` [PATCH v2 13/13] ASoC: topology: Add support for BE and CC DAI Links mengdong.lin
2015-11-05 10:15 ` [PATCH v2 00/13] ASoC: topology: Add support for PCM, BE & CC links Mengdong Lin

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=9cb8b4b46674b6688c92bf9c22f0cd9db1b86dff.1446717205.git.mengdong.lin@linux.intel.com \
    --to=mengdong.lin@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jeeja.kp@intel.com \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=mengdong.lin@intel.com \
    --cc=subhransu.s.prusty@intel.com \
    --cc=tiwai@suse.de \
    --cc=vinod.koul@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.