ASoC: add for_each_comp_order() macro

To be more readable code, this patch adds
new for_each_comp_order() 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 34efab6baff632b5c93c0e5106f13c5dcb71063e..93aa894a57ef0256c34f8d3bbf7e97ab4e3c193d 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -372,6 +372,11 @@
 #define SND_SOC_COMP_ORDER_LATE                1
 #define SND_SOC_COMP_ORDER_LAST                2
 
+#define for_each_comp_order(order)             \
+       for (order  = SND_SOC_COMP_ORDER_FIRST; \
+            order <= SND_SOC_COMP_ORDER_LAST;  \
+            order++)
+
 /*
  * Bias levels
  *

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 673a694ede3ec2572e6cb217339dfb260c57b2e1..d8625ac2b20150267206ba11b4121a39b3e03231 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -992,14 +992,12 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
        struct snd_soc_pcm_runtime *rtd;
        struct snd_soc_dai_link *link, *_link;
 
-       for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
-                       order++) {
+       for_each_comp_order(order) {
                for_each_card_rtds(card, rtd)
                        soc_remove_link_dais(card, rtd, order);
        }
 
-       for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
-                       order++) {
+       for_each_comp_order(order) {
                for_each_card_rtds(card, rtd)
                        soc_remove_link_components(card, rtd, order);
        }
@@ -1617,8 +1615,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
        int order;
        int ret;
 
-       for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
-               order++) {
+       for_each_comp_order(order) {
                list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) {
                        if (comp->driver->probe_order == order) {
                                ret = soc_probe_component(card, comp);
@@ -1640,8 +1637,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
        struct snd_soc_component *comp, *_comp;
        int order;
 
-       for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
-               order++) {
+       for_each_comp_order(order) {
                list_for_each_entry_safe(comp, _comp,
                        &card->aux_comp_list, card_aux_list) {
 
@@ -2013,8 +2009,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
        }
 
        /* probe all components used by DAI links on this card */
-       for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
-                       order++) {
+       for_each_comp_order(order) {
                for_each_card_rtds(card, rtd) {
                        ret = soc_probe_link_components(card, rtd, order);
                        if (ret < 0) {
@@ -2047,8 +2042,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
        }
 
        /* probe all DAI links on this card */
-       for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
-                       order++) {
+       for_each_comp_order(order) {
                for_each_card_rtds(card, rtd) {
                        ret = soc_probe_link_dais(card, rtd, order);
                        if (ret < 0) {