* [PATCH] ASoC: dapm: Fix double prefix addition
@ 2014-01-15 21:03 Arun Shamanna Lakshmi
2014-01-17 18:57 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Arun Shamanna Lakshmi @ 2014-01-15 21:03 UTC (permalink / raw)
To: broonie, lgirdwood
Cc: perex, tiwai, alsa-devel, linux-kernel, Arun Shamanna Lakshmi,
Songhee Baek
The prefix for the codec driver can be used during dual identical
codec usecases. However, dapm adds prefix twice for codec DAI widget
in snd_soc_dapm_add_route API.
This change is to avoid double prefix addition for codec DAI widget
and is needed while using identical dual codecs.
Signed-off-by: Songhee Baek <sbaek@nvidia.com>
Signed-off-by: Arun Shamanna Lakshmi <aruns@nvidia.com>
---
sound/soc/soc-dapm.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2a44fe9..dc8ff13 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2476,7 +2476,8 @@ err:
}
static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
- const struct snd_soc_dapm_route *route)
+ const struct snd_soc_dapm_route *route,
+ unsigned int is_prefixed)
{
struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w;
struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL;
@@ -2486,7 +2487,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
char prefixed_source[80];
int ret;
- if (dapm->codec && dapm->codec->name_prefix) {
+ if (dapm->codec && dapm->codec->name_prefix && !is_prefixed) {
snprintf(prefixed_sink, sizeof(prefixed_sink), "%s %s",
dapm->codec->name_prefix, route->sink);
sink = prefixed_sink;
@@ -2614,7 +2615,7 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);
for (i = 0; i < num; i++) {
- r = snd_soc_dapm_add_route(dapm, route);
+ r = snd_soc_dapm_add_route(dapm, route, false);
if (r < 0) {
dev_err(dapm->dev, "ASoC: Failed to add route %s -> %s -> %s\n",
route->source,
@@ -3670,7 +3671,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card)
cpu_dai->codec->name, r.source,
codec_dai->platform->name, r.sink);
- snd_soc_dapm_add_route(&card->dapm, &r);
+ snd_soc_dapm_add_route(&card->dapm, &r, true);
}
/* connect BE DAI capture if widgets are valid */
@@ -3681,7 +3682,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card)
codec_dai->codec->name, r.source,
cpu_dai->platform->name, r.sink);
- snd_soc_dapm_add_route(&card->dapm, &r);
+ snd_soc_dapm_add_route(&card->dapm, &r, true);
}
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: dapm: Fix double prefix addition
2014-01-15 21:03 [PATCH] ASoC: dapm: Fix double prefix addition Arun Shamanna Lakshmi
@ 2014-01-17 18:57 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2014-01-17 18:57 UTC (permalink / raw)
To: Arun Shamanna Lakshmi
Cc: lgirdwood, perex, tiwai, alsa-devel, linux-kernel, Songhee Baek
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
On Wed, Jan 15, 2014 at 01:03:16PM -0800, Arun Shamanna Lakshmi wrote:
> The prefix for the codec driver can be used during dual identical
> codec usecases. However, dapm adds prefix twice for codec DAI widget
> in snd_soc_dapm_add_route API.
>
> This change is to avoid double prefix addition for codec DAI widget
> and is needed while using identical dual codecs.
Well, it's just a cosmetic thing so it's not *needed* per se but anyway.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-17 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-15 21:03 [PATCH] ASoC: dapm: Fix double prefix addition Arun Shamanna Lakshmi
2014-01-17 18:57 ` Mark Brown
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).