evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: core: Remove duplicated rtd->codec initialization

Browse source 
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>
This commit is contained in:
Lars-Peter Clausen 2014-07-01 22:13:45 +02:00 • committed by Mark Brown
parent 211bcc6c3a
commit b8257be5ff
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/soc-core.c
View file

@ -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,
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,
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];