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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 98555f833ab40715abf37396bd8164274e00221f..1f5b4901415e38deb8aa6b7b2c1bc572fbd0e564 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -865,7 +865,6 @@ struct snd_soc_platform {
 
        struct snd_soc_card *card;
        struct list_head list;
-       struct list_head card_list;
 
        struct snd_soc_component component;
 
@@ -1056,7 +1055,6 @@ struct snd_soc_card {
 
        /* lists of probed devices belonging to this card */
        struct list_head codec_dev_list;
-       struct list_head platform_dev_list;
 
        struct list_head widgets;
        struct list_head paths;
@@ -1299,7 +1297,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)
 {
        INIT_LIST_HEAD(&card->codec_dev_list);
-       INIT_LIST_HEAD(&card->platform_dev_list);
        INIT_LIST_HEAD(&card->widgets);
        INIT_LIST_HEAD(&card->paths);
        INIT_LIST_HEAD(&card->dapm_list);

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6e47610f73a09ad367cc6a94ef7b9dd64fc45bad..a5edb31ddfffd7b513947047e6216f70ab063f7b 100644 (file)
--- 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)
 
        soc_cleanup_platform_debugfs(platform);
        platform->probed = 0;
-       list_del(&platform->card_list);
        module_put(platform->dev->driver->owner);
 
        return 0;
@@ -1297,7 +1296,6 @@ static int soc_probe_platform(struct snd_soc_card *card,
 
        /* mark platform as probed and add to card platform list */
        platform->probed = 1;
-       list_add(&platform->card_list, &card->platform_dev_list);
        list_add(&platform->component.dapm.list, &card->dapm_list);
 
        return 0;