Commit 7b4a469e authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove name_prefix unset during DAI link init hack again 



This was initially removed in commit 6479f15a ("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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 37018610

sound/soc/soc-core.c

+0 −13
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE