[v2,12/12] ASoC: Remove name_prefix unset during DAI link init hack

Commit Message

Lars-Peter Clausen March 12, 2014, 2:27 p.m. UTC

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: Lars-Peter Clausen <[e-mail]>
---
 sound/soc/soc-core.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Mark Brown March 25, 2014, 12:53 p.m. UTC | #1

On Wed, Mar 12, 2014 at 03:27:40PM +0100, Lars-Peter Clausen wrote:
> 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

Applied, thanks.

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fe1df50..30d5df0 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1246,7 +1246,7 @@  static int soc_post_component_init(struct snd_soc_card *card,
 	struct snd_soc_dai_link *dai_link = NULL;
 	struct snd_soc_aux_dev *aux_dev = NULL;
 	struct snd_soc_pcm_runtime *rtd;
-	const char *temp, *name;
+	const char *name;
 	int ret = 0;
 
 	if (!dailess) {
@@ -1260,10 +1260,6 @@  static int soc_post_component_init(struct snd_soc_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 */
 	if (!dailess && dai_link->init)
 		ret = dai_link->init(rtd);
@@ -1273,7 +1269,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);
 		return ret;
 	}
-	codec->name_prefix = temp;
 
 	/* register the rtd device */
 	rtd->codec = codec;