Unverified Commit 39caefda authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-card: add snd_soc_card_set_bias_level() 



Card related function should be implemented at soc-card now.
This patch adds it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87sgfkzv4g.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-card.h

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ int snd_soc_card_probe(struct snd_soc_card *card); 
int snd_soc_card_late_probe(struct snd_soc_card *card);

int snd_soc_card_remove(struct snd_soc_card *card);



int snd_soc_card_set_bias_level(struct snd_soc_card *card,

				struct snd_soc_dapm_context *dapm,

				enum snd_soc_bias_level level);



/* device driver data */

static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

					    void *data)

sound/soc/soc-card.c

+12 −0
Original line number Diff line number Diff line
@@ -179,3 +179,15 @@ int snd_soc_card_remove(struct snd_soc_card *card) 


	return soc_card_ret(card, ret);

}



int snd_soc_card_set_bias_level(struct snd_soc_card *card,

				struct snd_soc_dapm_context *dapm,

				enum snd_soc_bias_level level)

{

	int ret = 0;



	if (card && card->set_bias_level)

		ret = card->set_bias_level(card, dapm, level);



	return soc_card_ret(card, ret);

}

sound/soc/soc-dapm.c

+1 −2
Original line number Diff line number Diff line
@@ -725,8 +725,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm, 


	trace_snd_soc_bias_level_start(card, level);



	if (card && card->set_bias_level)

		ret = card->set_bias_level(card, dapm, level);

	ret = snd_soc_card_set_bias_level(card, dapm, level);

	if (ret != 0)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE