Commit 1a1035a9 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f70f18f7
...@@ -372,6 +372,11 @@ ...@@ -372,6 +372,11 @@
#define SND_SOC_COMP_ORDER_LATE 1 #define SND_SOC_COMP_ORDER_LATE 1
#define SND_SOC_COMP_ORDER_LAST 2 #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 * Bias levels
* *
......
...@@ -992,14 +992,12 @@ static void soc_remove_dai_links(struct snd_soc_card *card) ...@@ -992,14 +992,12 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
struct snd_soc_dai_link *link, *_link; struct snd_soc_dai_link *link, *_link;
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for_each_comp_order(order) {
order++) {
for_each_card_rtds(card, rtd) for_each_card_rtds(card, rtd)
soc_remove_link_dais(card, rtd, order); soc_remove_link_dais(card, rtd, order);
} }
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for_each_comp_order(order) {
order++) {
for_each_card_rtds(card, rtd) for_each_card_rtds(card, rtd)
soc_remove_link_components(card, rtd, order); soc_remove_link_components(card, rtd, order);
} }
...@@ -1617,8 +1615,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) ...@@ -1617,8 +1615,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
int order; int order;
int ret; int ret;
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for_each_comp_order(order) {
order++) {
list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) { list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) {
if (comp->driver->probe_order == order) { if (comp->driver->probe_order == order) {
ret = soc_probe_component(card, comp); ret = soc_probe_component(card, comp);
...@@ -1640,8 +1637,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card) ...@@ -1640,8 +1637,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
struct snd_soc_component *comp, *_comp; struct snd_soc_component *comp, *_comp;
int order; int order;
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for_each_comp_order(order) {
order++) {
list_for_each_entry_safe(comp, _comp, list_for_each_entry_safe(comp, _comp,
&card->aux_comp_list, card_aux_list) { &card->aux_comp_list, card_aux_list) {
...@@ -2013,8 +2009,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -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 */ /* probe all components used by DAI links on this card */
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for_each_comp_order(order) {
order++) {
for_each_card_rtds(card, rtd) { for_each_card_rtds(card, rtd) {
ret = soc_probe_link_components(card, rtd, order); ret = soc_probe_link_components(card, rtd, order);
if (ret < 0) { if (ret < 0) {
...@@ -2047,8 +2042,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -2047,8 +2042,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
} }
/* probe all DAI links on this card */ /* probe all DAI links on this card */
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for_each_comp_order(order) {
order++) {
for_each_card_rtds(card, rtd) { for_each_card_rtds(card, rtd) {
ret = soc_probe_link_dais(card, rtd, order); ret = soc_probe_link_dais(card, rtd, order);
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment