ASoC: Remove card's DAI list

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>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index fad76769f153d8cfdec2b796d892d6d0f3783798..e2c3e45d06560c732cf619ed851fec27824a0e3c 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -277,7 +277,6 @@ struct snd_soc_dai {
        struct snd_soc_card *card;
 
        struct list_head list;
-       struct list_head card_list;
 };
 
 static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,

diff --git a/include/sound/soc.h b/include/sound/soc.h
index e84f22f89765fe4c9446b9bd55377035cd922092..96d073fe7cd25269e018a4e70f66c16f912d092e 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1021,7 +1021,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 dai_dev_list;
 
        struct list_head widgets;
        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)
 {
-       INIT_LIST_HEAD(&card->dai_dev_list);
        INIT_LIST_HEAD(&card->codec_dev_list);
        INIT_LIST_HEAD(&card->platform_dev_list);
        INIT_LIST_HEAD(&card->widgets);

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 520d2489d23cf62d0da6fe2fbb07948429b6cb78..ada7cbc9fb945f77a3039f7b11511696c4e16ce6 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1017,7 +1017,6 @@ static void soc_remove_codec_dai(struct snd_soc_dai *codec_dai, int order)
                                        codec_dai->name, err);
                }
                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->probed = 0;
-               list_del(&cpu_dai->card_list);
 
                if (!cpu_dai->codec) {
                        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 */
                codec_dai->probed = 1;
-               list_add(&codec_dai->card_list, &card->dai_dev_list);
        }
 
        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;
-               /* 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 */