]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: dapm - Make DAPM reset code a separate function.
authorLiam Girdwood <lrg@ti.com>
Wed, 15 Feb 2012 15:15:34 +0000 (15:15 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 15 Feb 2012 15:56:49 +0000 (07:56 -0800)
It's useful to export the DAPM reset as a static function for future use
by other DAPM functions. e.g. The dynamic PCM query widgets resets the DAPM
graph before working out active paths.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-dapm.c

index 0c94027c4e3b30c716254776aae9f07231e42cf2..227887e05b708d998b21264fe523ff49f366396c 100644 (file)
@@ -169,6 +169,19 @@ static inline struct snd_soc_card *dapm_get_soc_card(
        return NULL;
 }
 
+static void dapm_reset(struct snd_soc_card *card)
+{
+       struct snd_soc_dapm_widget *w;
+
+       memset(&card->dapm_stats, 0, sizeof(card->dapm_stats));
+
+       list_for_each_entry(w, &card->widgets, list) {
+               w->power_checked = false;
+               w->inputs = -1;
+               w->outputs = -1;
+       }
+}
+
 static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg)
 {
        if (w->codec)
@@ -1402,13 +1415,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
                }
        }
 
-       memset(&card->dapm_stats, 0, sizeof(card->dapm_stats));
-
-       list_for_each_entry(w, &card->widgets, list) {
-               w->power_checked = false;
-               w->inputs = -1;
-               w->outputs = -1;
-       }
+       dapm_reset(card);
 
        /* Check which widgets we need to power and store them in
         * lists indicating if they should be powered up or down.  We