ASoC: add for_each_card_links() macro

To be more readable code, this patch adds
new for_each_card_links() macro, and replace existing code to it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index f94b989e7a1a1b6e8c2c14d92f66662a04901e89..1fffbaa819d9ddde6f43d37e629b31499560e89b 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1125,6 +1125,12 @@ struct snd_soc_card {
             ((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \
             (i)++)
 
+#define for_each_card_links(card, link)                                \
+       list_for_each_entry(dai_link, &(card)->dai_link_list, list)
+#define for_each_card_links_safe(card, link, _link)                    \
+       list_for_each_entry_safe(link, _link, &(card)->dai_link_list, list)
+
+
 /* SoC machine DAI configuration, glues a codec and cpu DAI together */
 struct snd_soc_pcm_runtime {
        struct device *dev;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 532d8c59ed1e36b4c2682af63a10c76cbea2f231..4951736356421cf144ea2a65a4986c401971d2e8 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -816,7 +816,7 @@ struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card,
 
        lockdep_assert_held(&client_mutex);
 
-       list_for_each_entry_safe(link, _link, &card->dai_link_list, list) {
+       for_each_card_links_safe(card, link, _link) {
                if (link->id != id)
                        continue;
 
@@ -1004,7 +1004,7 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
                        soc_remove_link_components(card, rtd, order);
        }
 
-       list_for_each_entry_safe(link, _link, &card->dai_link_list, list) {
+       for_each_card_links_safe(card, link, _link) {
                if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK)
                        dev_warn(card->dev, "Topology forgot to remove link %s?\n",
                                link->name);
@@ -1219,7 +1219,7 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card,
        if (dai_link->dobj.type && card->remove_dai_link)
                card->remove_dai_link(card, dai_link);
 
-       list_for_each_entry_safe(link, _link, &card->dai_link_list, list) {
+       for_each_card_links_safe(card, link, _link) {
                if (link == dai_link) {
                        list_del(&link->list);
                        return;
@@ -2033,7 +2033,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
        /* Find new DAI links added during probing components and bind them.
         * Components with topology may bring new DAIs and DAI links.
         */
-       list_for_each_entry(dai_link, &card->dai_link_list, list) {
+       for_each_card_links(card, dai_link) {
                if (soc_is_dai_link_bound(card, dai_link))
                        continue;