ASoC: core: Remove duplicated rtd->codec initialization

rtd->codec is already initialized in soc_bind_dai_link(), so there is no need to
do it again in soc_dai_link_init(). Removing the rtd->codec initialization from
soc_dai_link_init() also removes the need for soc_dai_link_init() to know about
the CODEC at all.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 72d4a2b009fa..0cd36b781f4d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1308,9 +1308,7 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
         return 0;
 }
 
-static int soc_dai_link_init(struct snd_soc_card *card,
-                             struct snd_soc_codec *codec,
-                             int num)
+static int soc_dai_link_init(struct snd_soc_card *card, int num)
 {
         struct snd_soc_dai_link *dai_link =  &card->dai_link[num];
         struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
@@ -1325,8 +1323,6 @@ static int soc_dai_link_init(struct snd_soc_card *card,
                         return ret;
         }
 
-        rtd->codec = codec;
-
         return 0;
 }
 
@@ -1344,7 +1340,7 @@ static int soc_post_component_init(struct snd_soc_card *card,
                 dai_link = &card->dai_link[num];
                 rtd = &card->rtd[num];
                 name = dai_link->name;
-                ret = soc_dai_link_init(card, codec, num);
+                ret = soc_dai_link_init(card, num);
         } else {
                 aux_dev = &card->aux_dev[num];
                 rtd = &card->rtd_aux[num];