Commit 6479f15a authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: Remove name_prefix unset during DAI link init hack

Before we had card level support for DAPM and controls machine drivers would
register their controls and DAPM elements with the CODEC. This required us to
temporarily unset the name_prefix of a CODEC during the rtd init callback to
avoid the machine level controls getting the CODEC's prefix. Now that all
machine drivers properly register their machine level controls and DAPM elements
with the card rather than with the CODEC we can drop the hack that sets the
CODEC's name_prefix to NULL while calling the DAI link or AUX dev init callback.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e090d5b6
...@@ -1253,7 +1253,7 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -1253,7 +1253,7 @@ static int soc_post_component_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link = NULL; struct snd_soc_dai_link *dai_link = NULL;
struct snd_soc_aux_dev *aux_dev = NULL; struct snd_soc_aux_dev *aux_dev = NULL;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
const char *temp, *name; const char *name;
int ret = 0; int ret = 0;
if (!dailess) { if (!dailess) {
...@@ -1267,10 +1267,6 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -1267,10 +1267,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
} }
rtd->card = card; rtd->card = card;
/* machine controls, routes and widgets are not prefixed */
temp = codec->name_prefix;
codec->name_prefix = NULL;
/* do machine specific initialization */ /* do machine specific initialization */
if (!dailess && dai_link->init) if (!dailess && dai_link->init)
ret = dai_link->init(rtd); ret = dai_link->init(rtd);
...@@ -1280,7 +1276,6 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -1280,7 +1276,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
dev_err(card->dev, "ASoC: failed to init %s: %d\n", name, ret); dev_err(card->dev, "ASoC: failed to init %s: %d\n", name, ret);
return ret; return ret;
} }
codec->name_prefix = temp;
/* register the rtd device */ /* register the rtd device */
rtd->codec = codec; rtd->codec = codec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment