ASoC: soc-dapm: add for_each_card_widgets() macro

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87r1y2goga.wl-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 3aee33c..03054bf 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1120,6 +1120,11 @@ struct snd_soc_card {
 #define for_each_card_dapms(card, dapm)                                        \
        list_for_each_entry(dapm, &card->dapm_list, list)
 
+#define for_each_card_widgets(card, w)\
+       list_for_each_entry(w, &card->widgets, list)
+#define for_each_card_widgets_safe(card, w, _w)        \
+       list_for_each_entry_safe(w, _w, &card->widgets, 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-dapm.c b/sound/soc/soc-dapm.c
index ac48303..e00a465 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -302,7 +302,7 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card)
 
        mutex_lock(&card->dapm_mutex);
 
-       list_for_each_entry(w, &card->widgets, list) {
+       for_each_card_widgets(card, w) {
                if (w->is_ep) {
                        dapm_mark_dirty(w, "Rechecking endpoints");
                        if (w->is_ep & SND_SOC_DAPM_EP_SINK)
@@ -589,7 +589,7 @@ static void dapm_reset(struct snd_soc_card *card)
 
        memset(&card->dapm_stats, 0, sizeof(card->dapm_stats));
 
-       list_for_each_entry(w, &card->widgets, list) {
+       for_each_card_widgets(card, w) {
                w->new_power = w->power;
                w->power_checked = false;
        }
@@ -833,7 +833,7 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
 
        *kcontrol = NULL;
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
+       for_each_card_widgets(dapm->card, w) {
                if (w == kcontrolw || w->dapm != kcontrolw->dapm)
                        continue;
                for (i = 0; i < w->num_kcontrols; i++) {
@@ -1967,7 +1967,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
                dapm_power_one_widget(w, &up_list, &down_list);
        }
 
-       list_for_each_entry(w, &card->widgets, list) {
+       for_each_card_widgets(card, w) {
                switch (w->id) {
                case snd_soc_dapm_pre:
                case snd_soc_dapm_post:
@@ -2376,7 +2376,7 @@ static ssize_t dapm_widget_show_component(struct snd_soc_component *cmpnt,
        if (!cmpnt->card)
                return 0;
 
-       list_for_each_entry(w, &cmpnt->card->widgets, list) {
+       for_each_card_widgets(cmpnt->card, w) {
                if (w->dapm != dapm)
                        continue;
 
@@ -2496,7 +2496,7 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
 {
        struct snd_soc_dapm_widget *w, *next_w;
 
-       list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) {
+       for_each_card_widgets_safe(dapm->card, w, next_w) {
                if (w->dapm != dapm)
                        continue;
                snd_soc_dapm_free_widget(w);
@@ -2511,7 +2511,7 @@ static struct snd_soc_dapm_widget *dapm_find_widget(
        struct snd_soc_dapm_widget *w;
        struct snd_soc_dapm_widget *fallback = NULL;
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
+       for_each_card_widgets(dapm->card, w) {
                if (!strcmp(w->name, pin)) {
                        if (w->dapm == dapm)
                                return w;
@@ -2910,7 +2910,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
         * find src and dest widgets over all widgets but favor a widget from
         * current DAPM context
         */
-       list_for_each_entry(w, &dapm->card->widgets, list) {
+       for_each_card_widgets(dapm->card, w) {
                if (!wsink && !(strcmp(w->name, sink))) {
                        wtsink = w;
                        if (w->dapm == dapm) {
@@ -3189,7 +3189,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_card *card)
 
        mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);
 
-       list_for_each_entry(w, &card->widgets, list)
+       for_each_card_widgets(card, w)
        {
                if (w->new)
                        continue;
@@ -3703,6 +3703,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
        w->dapm = dapm;
        INIT_LIST_HEAD(&w->list);
        INIT_LIST_HEAD(&w->dirty);
+       /* see for_each_card_widgets */
        list_add_tail(&w->list, &dapm->card->widgets);
 
        snd_soc_dapm_for_each_direction(dir) {
@@ -4227,7 +4228,7 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
        struct snd_soc_dai *dai;
 
        /* For each DAI widget... */
-       list_for_each_entry(dai_w, &card->widgets, list) {
+       for_each_card_widgets(card, dai_w) {
                switch (dai_w->id) {
                case snd_soc_dapm_dai_in:
                case snd_soc_dapm_dai_out:
@@ -4246,7 +4247,7 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
                dai = dai_w->priv;
 
                /* ...find all widgets with the same stream and link them */
-               list_for_each_entry(w, &card->widgets, list) {
+               for_each_card_widgets(card, w) {
                        if (w->dapm != dai_w->dapm)
                                continue;
 
@@ -4789,7 +4790,7 @@ static void soc_dapm_shutdown_dapm(struct snd_soc_dapm_context *dapm)
 
        mutex_lock(&card->dapm_mutex);
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
+       for_each_card_widgets(dapm->card, w) {
                if (w->dapm != dapm)
                        continue;
                if (w->power) {

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 575da6a..33909af 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -2774,7 +2774,7 @@ void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm,
 {
        struct snd_soc_dapm_widget *w, *next_w;
 
-       list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) {
+       for_each_card_widgets_safe(dapm->card, w, next_w) {
 
                /* make sure we are a widget with correct context */
                if (w->dobj.type != SND_SOC_DOBJ_WIDGET || w->dapm != dapm)