diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-07-17 16:01:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-22 18:15:57 -0400 |
commit | 9898e1ccf5af70ad2d03d5b77c591fb243c0f021 (patch) | |
tree | 8d29b8be75df0ade70c45acd698b01a19bea4562 | |
parent | 3d9501aff3032f41a0767906ebb5bd06a3753bde (diff) |
ASoC: Remove per card platform list
The platform_dev_list was added in commit f0fba2ad1b ("ASoC: multi-component -
ASoC Multi-Component Support") and while platforms are added and remove from
that list it is otherwise unused. This patch removes it again.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | include/sound/soc.h | 3 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 98555f833ab4..1f5b4901415e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -865,7 +865,6 @@ struct snd_soc_platform { | |||
865 | 865 | ||
866 | struct snd_soc_card *card; | 866 | struct snd_soc_card *card; |
867 | struct list_head list; | 867 | struct list_head list; |
868 | struct list_head card_list; | ||
869 | 868 | ||
870 | struct snd_soc_component component; | 869 | struct snd_soc_component component; |
871 | 870 | ||
@@ -1056,7 +1055,6 @@ struct snd_soc_card { | |||
1056 | 1055 | ||
1057 | /* lists of probed devices belonging to this card */ | 1056 | /* lists of probed devices belonging to this card */ |
1058 | struct list_head codec_dev_list; | 1057 | struct list_head codec_dev_list; |
1059 | struct list_head platform_dev_list; | ||
1060 | 1058 | ||
1061 | struct list_head widgets; | 1059 | struct list_head widgets; |
1062 | struct list_head paths; | 1060 | struct list_head paths; |
@@ -1299,7 +1297,6 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd) | |||
1299 | static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) | 1297 | static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) |
1300 | { | 1298 | { |
1301 | INIT_LIST_HEAD(&card->codec_dev_list); | 1299 | INIT_LIST_HEAD(&card->codec_dev_list); |
1302 | INIT_LIST_HEAD(&card->platform_dev_list); | ||
1303 | INIT_LIST_HEAD(&card->widgets); | 1300 | INIT_LIST_HEAD(&card->widgets); |
1304 | INIT_LIST_HEAD(&card->paths); | 1301 | INIT_LIST_HEAD(&card->paths); |
1305 | INIT_LIST_HEAD(&card->dapm_list); | 1302 | INIT_LIST_HEAD(&card->dapm_list); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6e47610f73a0..a5edb31ddfff 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -1027,7 +1027,6 @@ static int soc_remove_platform(struct snd_soc_platform *platform) | |||
1027 | 1027 | ||
1028 | soc_cleanup_platform_debugfs(platform); | 1028 | soc_cleanup_platform_debugfs(platform); |
1029 | platform->probed = 0; | 1029 | platform->probed = 0; |
1030 | list_del(&platform->card_list); | ||
1031 | module_put(platform->dev->driver->owner); | 1030 | module_put(platform->dev->driver->owner); |
1032 | 1031 | ||
1033 | return 0; | 1032 | return 0; |
@@ -1297,7 +1296,6 @@ static int soc_probe_platform(struct snd_soc_card *card, | |||
1297 | 1296 | ||
1298 | /* mark platform as probed and add to card platform list */ | 1297 | /* mark platform as probed and add to card platform list */ |
1299 | platform->probed = 1; | 1298 | platform->probed = 1; |
1300 | list_add(&platform->card_list, &card->platform_dev_list); | ||
1301 | list_add(&platform->component.dapm.list, &card->dapm_list); | 1299 | list_add(&platform->component.dapm.list, &card->dapm_list); |
1302 | 1300 | ||
1303 | return 0; | 1301 | return 0; |