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

Commit 3eb29dfb authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: dapm: Add unlocked version of snd_soc_dapm_sync 



We will often call sync after several functions that require the DAPM
mutex to be held. Rather than release and immediately relock the mutex
provide an unlocked function for this situation.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent f6d5e586

include/sound/soc-dapm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -461,6 +461,7 @@ int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

				const char *pin);

				const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

				  const char *pin);

				  const char *pin);

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,

sound/soc/soc-dapm.c

+22 −5
Original line number Original line Diff line number Diff line
@@ -2342,18 +2342,18 @@ static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm, 
}

}





/**

/**

 * snd_soc_dapm_sync - scan and power dapm paths

 * snd_soc_dapm_sync_unlocked - scan and power dapm paths

 * @dapm: DAPM context

 * @dapm: DAPM context

 *

 *

 * Walks all dapm audio paths and powers widgets according to their

 * Walks all dapm audio paths and powers widgets according to their

 * stream or path usage.

 * stream or path usage.

 *

 *

 * Requires external locking.

 *

 * Returns 0 for success.

 * Returns 0 for success.

 */

 */

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)

int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm)

{

{

	int ret;



	/*

	/*

	 * Suppress early reports (eg, jacks syncing their state) to avoid

	 * Suppress early reports (eg, jacks syncing their state) to avoid

	 * silly DAPM runs during card startup.

	 * silly DAPM runs during card startup.
@@ -2361,8 +2361,25 @@ int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm) 
	if (!dapm->card || !dapm->card->instantiated)

	if (!dapm->card || !dapm->card->instantiated)

		return 0;

		return 0;





	return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP);

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_sync_unlocked);



/**

 * snd_soc_dapm_sync - scan and power dapm paths

 * @dapm: DAPM context

 *

 * Walks all dapm audio paths and powers widgets according to their

 * stream or path usage.

 *

 * Returns 0 for success.

 */

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)

{

	int ret;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	ret = dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP);

	ret = snd_soc_dapm_sync_unlocked(dapm);

	mutex_unlock(&dapm->card->dapm_mutex);

	mutex_unlock(&dapm->card->dapm_mutex);

	return ret;

	return ret;

}

}