Skip to content

Commit 39caefd

Browse files
morimotobroonie
authored andcommitted
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: Kuninori Morimoto <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent b0275d9 commit 39caefd

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

include/sound/soc-card.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ int snd_soc_card_probe(struct snd_soc_card *card);
2828
int snd_soc_card_late_probe(struct snd_soc_card *card);
2929
int snd_soc_card_remove(struct snd_soc_card *card);
3030

31+
int snd_soc_card_set_bias_level(struct snd_soc_card *card,
32+
struct snd_soc_dapm_context *dapm,
33+
enum snd_soc_bias_level level);
34+
3135
/* device driver data */
3236
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
3337
void *data)

sound/soc/soc-card.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,3 +179,15 @@ int snd_soc_card_remove(struct snd_soc_card *card)
179179

180180
return soc_card_ret(card, ret);
181181
}
182+
183+
int snd_soc_card_set_bias_level(struct snd_soc_card *card,
184+
struct snd_soc_dapm_context *dapm,
185+
enum snd_soc_bias_level level)
186+
{
187+
int ret = 0;
188+
189+
if (card && card->set_bias_level)
190+
ret = card->set_bias_level(card, dapm, level);
191+
192+
return soc_card_ret(card, ret);
193+
}

sound/soc/soc-dapm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,8 +725,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
725725

726726
trace_snd_soc_bias_level_start(card, level);
727727

728-
if (card && card->set_bias_level)
729-
ret = card->set_bias_level(card, dapm, level);
728+
ret = snd_soc_card_set_bias_level(card, dapm, level);
730729
if (ret != 0)
731730
goto out;
732731

0 commit comments

Comments
 (0)