ASoC: soc-core: add for_each_xxx macro for aux_dev

To be more readable code, this patch adds
new for_each_xxx() macro for aux_dev.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ftmc6w8s.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 12 insertions, 10 deletions

diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 6283e5025548..1f698adde506 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -111,6 +111,7 @@ static void axg_card_clean_references(struct axg_card *priv)
         struct snd_soc_card *card = &priv->card;
         struct snd_soc_dai_link *link;
         struct snd_soc_dai_link_component *codec;
+        struct snd_soc_aux_dev *aux;
         int i, j;
 
         if (card->dai_link) {
@@ -123,8 +124,8 @@ static void axg_card_clean_references(struct axg_card *priv)
         }
 
         if (card->aux_dev) {
-                for (i = 0; i < card->num_aux_devs; i++)
-                        of_node_put(card->aux_dev[i].dlc.of_node);
+                for_each_card_pre_auxs(card, i, aux)
+                        of_node_put(aux->dlc.of_node);
         }
 
         kfree(card->dai_link);
@@ -157,7 +158,7 @@ static int axg_card_add_aux_devices(struct snd_soc_card *card)
         card->aux_dev = aux;
         card->num_aux_devs = num;
 
-        for (i = 0; i < card->num_aux_devs; i++, aux++) {
+        for_each_card_pre_auxs(card, i, aux) {
                 aux->dlc.of_node =
                         of_parse_phandle(node, "audio-aux-devs", i);
                 if (!aux->dlc.of_node)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4af382d52675..e9f44505cc3e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1533,9 +1533,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
         return ret;
 }
 
-static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
+static int soc_bind_aux_dev(struct snd_soc_card *card,
+                            struct snd_soc_aux_dev *aux_dev)
 {
-        struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
         struct snd_soc_component *component;
 
         /* codecs, usually analog devices */
@@ -1544,6 +1544,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
                 return -EPROBE_DEFER;
 
         component->init = aux_dev->init;
+        /* see for_each_card_auxs */
         list_add(&component->card_aux_list, &card->aux_comp_list);
 
         return 0;
@@ -1556,7 +1557,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
         int ret;
 
         for_each_comp_order(order) {
-                list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) {
+                for_each_card_auxs(card, comp) {
                         if (comp->driver->probe_order == order) {
                                 ret = soc_probe_component(card, comp);
                                 if (ret < 0) {
@@ -1578,8 +1579,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
         int order;
 
         for_each_comp_order(order) {
-                list_for_each_entry_safe(comp, _comp,
-                        &card->aux_comp_list, card_aux_list) {
+                for_each_card_auxs_safe(card, comp, _comp) {
 
                         if (comp->driver->remove_order == order) {
                                 soc_remove_component(comp);
@@ -1913,6 +1913,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
 {
         struct snd_soc_pcm_runtime *rtd;
         struct snd_soc_dai_link *dai_link;
+        struct snd_soc_aux_dev *aux;
         int ret, i, order;
 
         mutex_lock(&client_mutex);
@@ -1943,8 +1944,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
         }
 
         /* bind aux_devs too */
-        for (i = 0; i < card->num_aux_devs; i++) {
-                ret = soc_bind_aux_dev(card, i);
+        for_each_card_pre_auxs(card, i, aux) {
+                ret = soc_bind_aux_dev(card, aux);
                 if (ret != 0)
                         goto probe_end;
         }