Unverified Commit 2e7f0a86 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dapm: add snd_soc_dapm_get_bias_level() 



Because struct snd_soc_dapm_context is soc-dapm framework specific, user
driver don't need to access its member directly, we would like to hide
them. struct snd_soc_dapm_context will be removed from header in the
future.

Many drivers are directly using dapm->idle_bias, but it should get it
via get_idle_bias() function. Makes it as global function.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/871pomx062.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4b4fdc8b

include/sound/soc-dapm.h

+2 −0
Original line number Diff line number Diff line
@@ -662,6 +662,8 @@ struct device *snd_soc_dapm_to_dev(struct snd_soc_dapm_context *dapm); 
struct snd_soc_card *snd_soc_dapm_to_card(struct snd_soc_dapm_context *dapm);

struct snd_soc_component *snd_soc_dapm_to_component(struct snd_soc_dapm_context *dapm);



bool snd_soc_dapm_get_idle_bias(struct snd_soc_dapm_context *dapm);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);

sound/soc/soc-dapm.c

+4 −3
Original line number Diff line number Diff line
@@ -2180,7 +2180,7 @@ static void dapm_power_one_widget(struct snd_soc_dapm_widget *w, 
		dapm_seq_insert(w, down_list, false);

}



static bool dapm_get_idle_bias(struct snd_soc_dapm_context *dapm)

bool snd_soc_dapm_get_idle_bias(struct snd_soc_dapm_context *dapm)

{

	if (dapm->idle_bias) {

		struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
@@ -2193,6 +2193,7 @@ static bool dapm_get_idle_bias(struct snd_soc_dapm_context *dapm) 


	return dapm->idle_bias;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_get_idle_bias);



/*

 * Scan each dapm widget for complete audio path.
@@ -2219,7 +2220,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event, 
	trace_snd_soc_dapm_start(card, event);



	for_each_card_dapms(card, d) {

		if (dapm_get_idle_bias(d))

		if (snd_soc_dapm_get_idle_bias(d))

			d->target_bias_level = SND_SOC_BIAS_STANDBY;

		else

			d->target_bias_level = SND_SOC_BIAS_OFF;
@@ -2286,7 +2287,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event, 
		if (d->target_bias_level > bias)

			bias = d->target_bias_level;

	for_each_card_dapms(card, d)

		if (dapm_get_idle_bias(d))

		if (snd_soc_dapm_get_idle_bias(d))

			d->target_bias_level = bias;



	trace_snd_soc_dapm_walk_done(card);