diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-05-28 03:50:35 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-30 03:11:40 +0200 |
| commit | d41278ea0579a8c1e216c5321e2d207705ab3b54 (patch) | |
| tree | e4e777e0bbcf401e7a99c3bb23a1c9af43fe19eb /sound | |
| parent | ASoC: soc-card: add snd_soc_card_set_bias_level() (diff) | |
| download | linux-d41278ea0579a8c1e216c5321e2d207705ab3b54.tar.xz linux-d41278ea0579a8c1e216c5321e2d207705ab3b54.zip | |
ASoC: soc-card: add snd_soc_card_set_bias_level_post()
Card related function should be implemented at soc-card now.
This patch adds it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87pnaozv2s.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-card.c | 12 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sound/soc/soc-card.c b/sound/soc/soc-card.c index dbcaa3d72dae..5bc2832b3505 100644 --- a/sound/soc/soc-card.c +++ b/sound/soc/soc-card.c @@ -191,3 +191,15 @@ int snd_soc_card_set_bias_level(struct snd_soc_card *card, return soc_card_ret(card, ret); } + +int snd_soc_card_set_bias_level_post(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_post) + ret = card->set_bias_level_post(card, dapm, level); + + return soc_card_ret(card, ret); +} diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 5dc7849ecf41..653a58c96e24 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -735,8 +735,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm, if (ret != 0) goto out; - if (card && card->set_bias_level_post) - ret = card->set_bias_level_post(card, dapm, level); + ret = snd_soc_card_set_bias_level_post(card, dapm, level); out: trace_snd_soc_bias_level_done(card, level); |