OSDN Git Service

ASoC: soc-core: remove unused num_dai_links
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 11 Sep 2018 06:59:01 +0000 (06:59 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 11 Sep 2018 16:18:39 +0000 (17:18 +0100)
ALSA SoC is counting card->dai_link_list user,
but no-one is using it.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc.h
sound/soc/soc-core.c

index 821bf99..e17a7ae 100644 (file)
@@ -1060,7 +1060,6 @@ struct snd_soc_card {
        struct snd_soc_dai_link *dai_link;  /* predefined links only */
        int num_links;  /* predefined links only */
        struct list_head dai_link_list; /* all links */
-       int num_dai_links;
 
        struct list_head rtd_list;
        int num_rtd;
index dde9b70..7e18937 100644 (file)
@@ -1013,7 +1013,6 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
                                link->name);
 
                list_del(&link->list);
-               card->num_dai_links--;
        }
 }
 
@@ -1182,7 +1181,6 @@ int snd_soc_add_dai_link(struct snd_soc_card *card,
                card->add_dai_link(card, dai_link);
 
        list_add_tail(&dai_link->list, &card->dai_link_list);
-       card->num_dai_links++;
 
        return 0;
 }
@@ -1220,7 +1218,6 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card,
        list_for_each_entry_safe(link, _link, &card->dai_link_list, list) {
                if (link == dai_link) {
                        list_del(&link->list);
-                       card->num_dai_links--;
                        return;
                }
        }
@@ -2712,7 +2709,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
        snd_soc_initialize_card_lists(card);
 
        INIT_LIST_HEAD(&card->dai_link_list);
-       card->num_dai_links = 0;
 
        INIT_LIST_HEAD(&card->rtd_list);
        card->num_rtd = 0;