[alsa-devel] [PATCH] ASoC: soc-core: remove unused num_dai_links

Kuninori Morimoto kuninori.morimoto.gx at renesas.com
Tue Sep 11 08:59:01 CEST 2018


From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>

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 at renesas.com>
---
 include/sound/soc.h  | 1 -
 sound/soc/soc-core.c | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 821bf99..e17a7ae 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 1f859cc..f43c532 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1009,7 +1009,6 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
 				link->name);
 
 		list_del(&link->list);
-		card->num_dai_links--;
 	}
 }
 
@@ -1185,7 +1184,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;
 }
@@ -1223,7 +1221,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;
 		}
 	}
@@ -2710,7 +2707,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;
-- 
2.7.4



More information about the Alsa-devel mailing list