From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 26 Apr 2014 11:02:29 +0000 (+0200)
Subject: ASoC: Remove name_prefix unset during DAI link init hack again
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7b4a469e583f7f0e3259f4e0fc0baa844bc72782;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ASoC: Remove name_prefix unset during DAI link init hack again

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>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b2d889667ab4..54a1d91f1d96 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1274,14 +1274,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);
@@ -1289,8 +1285,6 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
 			return ret;
 	}
 
-	codec->name_prefix = temp;
-
 	rtd->codec = codec;
 
 	return 0;
@@ -1302,15 +1296,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);
@@ -1318,8 +1307,6 @@ static int soc_dai_link_init(struct snd_soc_card *card,
 			return ret;
 	}
 
-	codec->name_prefix = temp;
-
 	rtd->codec = codec;
 
 	return 0;