Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c120e19 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: dapm - Make DAPM reset code a separate function. 



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: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 65f01ef0

sound/soc/soc-dapm.c

+14 −7
Original line number Diff line number Diff line
@@ -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