aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuninori Morimoto2018-09-11 06:59:01 +0000
committerMark Brown2018-09-11 17:18:39 +0100
commit4f1b327e65a9516a46ea491ce72a5161be176af8 (patch)
tree740cbc83553335c7823d02c3d4ae073774068e02
parent2eda3cb108b699a6ff78a87e25143c153bc88e41 (diff)
ASoC: soc-core: remove unused num_dai_links
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>
-rw-r--r--include/sound/soc.h1
-rw-r--r--sound/soc/soc-core.c4
2 files changed, 0 insertions, 5 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 821bf99992b8..e17a7ae9a155 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index dde9b70b58b5..7e18937c2214 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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;