diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 13 |
1 files changed, 0 insertions, 13 deletions
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; |