ASoC: Add dapm_find_widget helper

This patch adds a helper function for searching DAPM widgets by name.
This allows to streamline functions which operate on widgets by name.
It also allows to get rid of copy'n'pasted code which was added to fallback to
widgets from other contexts if the widget was not found in the current context.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 856471703bd340504e2a84a362cc39a519f79c87..378f08adee56d51614453ee9cc7a5ab54a3eb574 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1458,40 +1458,43 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
        }
 }
 
-static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,
-                               const char *pin, int status)
+static struct snd_soc_dapm_widget *dapm_find_widget(
+                       struct snd_soc_dapm_context *dapm, const char *pin,
+                       bool search_other_contexts)
 {
        struct snd_soc_dapm_widget *w;
+       struct snd_soc_dapm_widget *fallback = NULL;
 
        list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (w->dapm != dapm)
-                       continue;
                if (!strcmp(w->name, pin)) {
-                       dev_dbg(w->dapm->dev, "dapm: pin %s = %d\n",
-                               pin, status);
-                       w->connected = status;
-                       /* Allow disabling of forced pins */
-                       if (status == 0)
-                               w->force = 0;
-                       return 0;
+                       if (w->dapm == dapm)
+                               return w;
+                       else
+                               fallback = w;
                }
        }
 
-       /* Try again in other contexts */
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (!strcmp(w->name, pin)) {
-                       dev_dbg(w->dapm->dev, "dapm: pin %s = %d\n",
-                               pin, status);
-                       w->connected = status;
-                       /* Allow disabling of forced pins */
-                       if (status == 0)
-                               w->force = 0;
-                       return 0;
-               }
+       if (search_other_contexts)
+               return fallback;
+
+       return NULL;
+}
+
+static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,
+                               const char *pin, int status)
+{
+       struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
+
+       if (!w) {
+               dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
+               return -EINVAL;
        }
 
-       dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
-       return -EINVAL;
+       w->connected = status;
+       if (status == 0)
+               w->force = 0;
+
+       return 0;
 }
 
 /**
@@ -2316,33 +2319,18 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin);
 int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,
                                  const char *pin)
 {
-       struct snd_soc_dapm_widget *w;
+       struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (w->dapm != dapm)
-                       continue;
-               if (!strcmp(w->name, pin)) {
-                       dev_dbg(w->dapm->dev,
-                               "dapm: force enable pin %s\n", pin);
-                       w->connected = 1;
-                       w->force = 1;
-                       return 0;
-               }
+       if (!w) {
+               dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
+               return -EINVAL;
        }
 
-       /* Try again with other contexts */
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (!strcmp(w->name, pin)) {
-                       dev_dbg(w->dapm->dev,
-                               "dapm: force enable pin %s\n", pin);
-                       w->connected = 1;
-                       w->force = 1;
-                       return 0;
-               }
-       }
+       dev_dbg(w->dapm->dev, "dapm: force enable pin %s\n", pin);
+       w->connected = 1;
+       w->force = 1;
 
-       dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
-       return -EINVAL;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin);
 
@@ -2394,20 +2382,10 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin);
 int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,
                                const char *pin)
 {
-       struct snd_soc_dapm_widget *w;
+       struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (w->dapm != dapm)
-                       continue;
-               if (!strcmp(w->name, pin))
-                       return w->connected;
-       }
-
-       /* Try again in other contexts */
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (!strcmp(w->name, pin))
-                       return w->connected;
-       }
+       if (w)
+               return w->connected;
 
        return 0;
 }
@@ -2427,19 +2405,16 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status);
 int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
                                const char *pin)
 {
-       struct snd_soc_dapm_widget *w;
+       struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, false);
 
-       list_for_each_entry(w, &dapm->card->widgets, list) {
-               if (w->dapm != dapm)
-                       continue;
-               if (!strcmp(w->name, pin)) {
-                       w->ignore_suspend = 1;
-                       return 0;
-               }
+       if (!w) {
+               dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
+               return -EINVAL;
        }
 
-       dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
-       return -EINVAL;
+       w->ignore_suspend = 1;
+
+       return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);