Unverified Commit 94e630a3 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: dapm: Cosmetic tidy up of snd_soc_dapm_new_control 



Move the function snd_soc_dapm_new_control to be next to
snd_soc_dapm_new_controls and add some kernel doc for it.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3bbf5d34

sound/soc/soc-dapm.c

+23 −14
Original line number Diff line number Diff line
@@ -3417,20 +3417,6 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch);



struct snd_soc_dapm_widget *

snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,

	const struct snd_soc_dapm_widget *widget)

{

	struct snd_soc_dapm_widget *w;



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

	w = snd_soc_dapm_new_control_unlocked(dapm, widget);

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



	return w;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);



struct snd_soc_dapm_widget *

snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,

			 const struct snd_soc_dapm_widget *widget)
@@ -3570,6 +3556,29 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, 
	return ERR_PTR(ret);

}



/**

 * snd_soc_dapm_new_control - create new dapm control

 * @dapm: DAPM context

 * @widget: widget template

 *

 * Creates new DAPM control based upon a template.

 *

 * Returns a widget pointer on success or an error pointer on failure

 */

struct snd_soc_dapm_widget *

snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,

			 const struct snd_soc_dapm_widget *widget)

{

	struct snd_soc_dapm_widget *w;



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

	w = snd_soc_dapm_new_control_unlocked(dapm, widget);

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



	return w;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);



/**

 * snd_soc_dapm_new_controls - create new dapm controls

 * @dapm: DAPM context