[PATCH] ASoC: Remove name_prefix unset during DAI link init hack again

[PATCH] ASoC: Remove name_prefix unset during DAI link init hack again

[Lars-Peter Clausen]

This was initially removed in commit 6479f15ad ("ASoC: Remove name_prefix unset
during DAI link init hack"), but was brought back in commit 503ae5e0 ("ASoC:
core: Add helpers for dai link and aux dev init") by accident. This patch
removes it again.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/soc-core.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f18112a..94c1668 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1272,14 +1272,10 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
 {
 	struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
 	struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num];
-	const char *temp;
 	int ret;
 
 	rtd->card = card;
 
-	temp = codec->name_prefix;
-	codec->name_prefix = NULL;
-
 	/* do machine specific initialization */
 	if (aux_dev->init) {
 		ret = aux_dev->init(&codec->dapm);
@@ -1287,8 +1283,6 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
 			return ret;
 	}
 
-	codec->name_prefix = temp;
-
 	rtd->codec = codec;
 
 	return 0;
@@ -1300,15 +1294,10 @@ static int soc_dai_link_init(struct snd_soc_card *card,
 {
 	struct snd_soc_dai_link *dai_link =  &card->dai_link[num];
 	struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
-	const char *temp;
 	int ret;
 
 	rtd->card = card;
 
-	/* machine controls, routes and widgets are not prefixed */
-	temp = codec->name_prefix;
-	codec->name_prefix = NULL;
-
 	/* do machine specific initialization */
 	if (dai_link->init) {
 		ret = dai_link->init(rtd);
@@ -1316,8 +1305,6 @@ static int soc_dai_link_init(struct snd_soc_card *card,
 			return ret;
 	}
 
-	codec->name_prefix = temp;
-
 	rtd->codec = codec;
 
 	return 0;
-- 
1.8.0

Re: [PATCH] ASoC: Remove name_prefix unset during DAI link init hack again

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 343 bytes --]

On Sat, Apr 26, 2014 at 01:02:29PM +0200, Lars-Peter Clausen wrote:
> This was initially removed in commit 6479f15ad ("ASoC: Remove name_prefix unset
> during DAI link init hack"), but was brought back in commit 503ae5e0 ("ASoC:
> core: Add helpers for dai link and aux dev init") by accident. This patch
> removes it again.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]