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

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 211bcc6c
...@@ -1308,9 +1308,7 @@ static int soc_aux_dev_init(struct snd_soc_card *card, ...@@ -1308,9 +1308,7 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
return 0; return 0;
} }
static int soc_dai_link_init(struct snd_soc_card *card, static int soc_dai_link_init(struct snd_soc_card *card, int num)
struct snd_soc_codec *codec,
int num)
{ {
struct snd_soc_dai_link *dai_link = &card->dai_link[num]; struct snd_soc_dai_link *dai_link = &card->dai_link[num];
struct snd_soc_pcm_runtime *rtd = &card->rtd[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, ...@@ -1325,8 +1323,6 @@ static int soc_dai_link_init(struct snd_soc_card *card,
return ret; return ret;
} }
rtd->codec = codec;
return 0; return 0;
} }
...@@ -1344,7 +1340,7 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -1344,7 +1340,7 @@ static int soc_post_component_init(struct snd_soc_card *card,
dai_link = &card->dai_link[num]; dai_link = &card->dai_link[num];
rtd = &card->rtd[num]; rtd = &card->rtd[num];
name = dai_link->name; name = dai_link->name;
ret = soc_dai_link_init(card, codec, num); ret = soc_dai_link_init(card, num);
} else { } else {
aux_dev = &card->aux_dev[num]; aux_dev = &card->aux_dev[num];
rtd = &card->rtd_aux[num]; rtd = &card->rtd_aux[num];
......
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