Commit 09e88f8a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-pcm: add for_each_dapm_widgets() macro

This patch adds new for_each_dapm_widgets() macro and use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/878slbceyg.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5c25bd64
...@@ -693,6 +693,11 @@ struct snd_soc_dapm_widget_list { ...@@ -693,6 +693,11 @@ struct snd_soc_dapm_widget_list {
struct snd_soc_dapm_widget *widgets[0]; struct snd_soc_dapm_widget *widgets[0];
}; };
#define for_each_dapm_widgets(list, i, widget) \
for ((i) = 0; \
(i) < list->num_widgets && (widget = list->widgets[i]); \
(i)++)
struct snd_soc_dapm_stats { struct snd_soc_dapm_stats {
int power_checks; int power_checks;
int path_checks; int path_checks;
......
...@@ -1724,9 +1724,7 @@ static void dapm_widget_update(struct snd_soc_card *card) ...@@ -1724,9 +1724,7 @@ static void dapm_widget_update(struct snd_soc_card *card)
wlist = dapm_kcontrol_get_wlist(update->kcontrol); wlist = dapm_kcontrol_get_wlist(update->kcontrol);
for (wi = 0; wi < wlist->num_widgets; wi++) { for_each_dapm_widgets(wlist, wi, w) {
w = wlist->widgets[wi];
if (w->event && (w->event_flags & SND_SOC_DAPM_PRE_REG)) { if (w->event && (w->event_flags & SND_SOC_DAPM_PRE_REG)) {
ret = w->event(w, update->kcontrol, SND_SOC_DAPM_PRE_REG); ret = w->event(w, update->kcontrol, SND_SOC_DAPM_PRE_REG);
if (ret != 0) if (ret != 0)
...@@ -1753,9 +1751,7 @@ static void dapm_widget_update(struct snd_soc_card *card) ...@@ -1753,9 +1751,7 @@ static void dapm_widget_update(struct snd_soc_card *card)
w->name, ret); w->name, ret);
} }
for (wi = 0; wi < wlist->num_widgets; wi++) { for_each_dapm_widgets(wlist, wi, w) {
w = wlist->widgets[wi];
if (w->event && (w->event_flags & SND_SOC_DAPM_POST_REG)) { if (w->event && (w->event_flags & SND_SOC_DAPM_POST_REG)) {
ret = w->event(w, update->kcontrol, SND_SOC_DAPM_POST_REG); ret = w->event(w, update->kcontrol, SND_SOC_DAPM_POST_REG);
if (ret != 0) if (ret != 0)
......
...@@ -1306,12 +1306,12 @@ static inline struct snd_soc_dapm_widget * ...@@ -1306,12 +1306,12 @@ static inline struct snd_soc_dapm_widget *
static int widget_in_list(struct snd_soc_dapm_widget_list *list, static int widget_in_list(struct snd_soc_dapm_widget_list *list,
struct snd_soc_dapm_widget *widget) struct snd_soc_dapm_widget *widget)
{ {
struct snd_soc_dapm_widget *w;
int i; int i;
for (i = 0; i < list->num_widgets; i++) { for_each_dapm_widgets(list, i, w)
if (widget == list->widgets[i]) if (widget == w)
return 1; return 1;
}
return 0; return 0;
} }
...@@ -1422,12 +1422,13 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, ...@@ -1422,12 +1422,13 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream,
struct snd_soc_card *card = fe->card; struct snd_soc_card *card = fe->card;
struct snd_soc_dapm_widget_list *list = *list_; struct snd_soc_dapm_widget_list *list = *list_;
struct snd_soc_pcm_runtime *be; struct snd_soc_pcm_runtime *be;
struct snd_soc_dapm_widget *widget;
int i, new = 0, err; int i, new = 0, err;
/* Create any new FE <--> BE connections */ /* Create any new FE <--> BE connections */
for (i = 0; i < list->num_widgets; i++) { for_each_dapm_widgets(list, i, widget) {
switch (list->widgets[i]->id) { switch (widget->id) {
case snd_soc_dapm_dai_in: case snd_soc_dapm_dai_in:
if (stream != SNDRV_PCM_STREAM_PLAYBACK) if (stream != SNDRV_PCM_STREAM_PLAYBACK)
continue; continue;
...@@ -1441,10 +1442,10 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, ...@@ -1441,10 +1442,10 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream,
} }
/* is there a valid BE rtd for this widget */ /* is there a valid BE rtd for this widget */
be = dpcm_get_be(card, list->widgets[i], stream); be = dpcm_get_be(card, widget, stream);
if (!be) { if (!be) {
dev_err(fe->dev, "ASoC: no BE found for %s\n", dev_err(fe->dev, "ASoC: no BE found for %s\n",
list->widgets[i]->name); widget->name);
continue; continue;
} }
...@@ -1460,7 +1461,7 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, ...@@ -1460,7 +1461,7 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream,
err = dpcm_be_connect(fe, be, stream); err = dpcm_be_connect(fe, be, stream);
if (err < 0) { if (err < 0) {
dev_err(fe->dev, "ASoC: can't connect %s\n", dev_err(fe->dev, "ASoC: can't connect %s\n",
list->widgets[i]->name); widget->name);
break; break;
} else if (err == 0) /* already connected */ } else if (err == 0) /* already connected */
continue; continue;
......
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