Skip to content

Commit

Permalink
ASoC: soc-core: remove unused num_dai_links
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Sep 11, 2018
1 parent 2eda3cb commit 4f1b327
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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--;
}
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4f1b327

Please sign in to comment.