Skip to content

Commit

Permalink
ASoC: Remove name_prefix unset during DAI link init hack again
Browse files Browse the repository at this point in the history
This was initially removed in commit 6479f15 ("ASoC: Remove name_prefix unset
during DAI link init hack"), but was brought back in commit 503ae5e ("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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Apr 26, 2014
1 parent 3701861 commit 7b4a469
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1274,23 +1274,17 @@ 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);
if (ret < 0)
return ret;
}

codec->name_prefix = temp;

rtd->codec = codec;

return 0;
Expand All @@ -1302,24 +1296,17 @@ 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);
if (ret < 0)
return ret;
}

codec->name_prefix = temp;

rtd->codec = codec;

return 0;
Expand Down

0 comments on commit 7b4a469

Please sign in to comment.