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

ASoC: Remove card's DAI list

Browse source 
Commit f0fba2ad1 ("ASoC: multi-component - ASoC Multi-Component Support") added
a per card list that keeps track of all the DAIs that have been registered with
the card, but the list has never been used. This patch removes it again.

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-05-06 09:39:37 +02:00 • committed by Mark Brown
parent 387f837b3d
commit 24faf76568
3 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sound/soc-dai.h
View file

@ -277,7 +277,6 @@ struct snd_soc_dai {
struct snd_soc_card *card; struct snd_soc_card *card;
struct list_head list; struct list_head list;
struct list_head card_list;
}; };
static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai, static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,

2
include/sound/soc.h
View file

@ -1021,7 +1021,6 @@ struct snd_soc_card {
/* lists of probed devices belonging to this card */ /* lists of probed devices belonging to this card */
struct list_head codec_dev_list; struct list_head codec_dev_list;
struct list_head platform_dev_list; struct list_head platform_dev_list;
struct list_head dai_dev_list;
struct list_head widgets; struct list_head widgets;
struct list_head paths; struct list_head paths;
@ -1207,7 +1206,6 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
{ {
INIT_LIST_HEAD(&card->dai_dev_list);
INIT_LIST_HEAD(&card->codec_dev_list); INIT_LIST_HEAD(&card->codec_dev_list);
INIT_LIST_HEAD(&card->platform_dev_list); INIT_LIST_HEAD(&card->platform_dev_list);
INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->widgets);

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

@ -1017,7 +1017,6 @@ static void soc_remove_codec_dai(struct snd_soc_dai *codec_dai, int order)
codec_dai->name, err); codec_dai->name, err);
} }
codec_dai->probed = 0; codec_dai->probed = 0;
list_del(&codec_dai->card_list);
} }
} }
@ -1049,7 +1048,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
cpu_dai->name, err); cpu_dai->name, err);
} }
cpu_dai->probed = 0; cpu_dai->probed = 0;
list_del(&cpu_dai->card_list);
if (!cpu_dai->codec) { if (!cpu_dai->codec) {
snd_soc_dapm_free(&cpu_dai->dapm); snd_soc_dapm_free(&cpu_dai->dapm);
@ -1405,7 +1403,6 @@ static int soc_probe_codec_dai(struct snd_soc_card *card,
/* mark codec_dai as probed and add to card dai list */ /* mark codec_dai as probed and add to card dai list */
codec_dai->probed = 1; codec_dai->probed = 1;
list_add(&codec_dai->card_list, &card->dai_dev_list);
} }
return 0; return 0;
@ -1490,8 +1487,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
} }
} }
cpu_dai->probed = 1; cpu_dai->probed = 1;
/* mark cpu_dai as probed and add to card dai list */
list_add(&cpu_dai->card_list, &card->dai_dev_list);
} }
/* probe the CODEC DAI */ /* probe the CODEC DAI */