Unverified Commit 934c752c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-card: add snd_soc_card_resume_pre() 



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/87zh9szv5k.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-card.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type, 


int snd_soc_card_suspend_pre(struct snd_soc_card *card);

int snd_soc_card_suspend_post(struct snd_soc_card *card);

int snd_soc_card_resume_pre(struct snd_soc_card *card);



/* device driver data */

static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

sound/soc/soc-card.c

+10 −0
Original line number Diff line number Diff line
@@ -99,3 +99,13 @@ int snd_soc_card_suspend_post(struct snd_soc_card *card) 


	return soc_card_ret(card, ret);

}



int snd_soc_card_resume_pre(struct snd_soc_card *card)

{

	int ret = 0;



	if (card->resume_pre)

		ret = card->resume_pre(card);



	return soc_card_ret(card, ret);

}

sound/soc/soc-core.c

+1 −2
Original line number Diff line number Diff line
@@ -660,8 +660,7 @@ static void soc_resume_deferred(struct work_struct *work) 
	/* Bring us up into D2 so that DAPM starts enabling things */

	snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D2);



	if (card->resume_pre)

		card->resume_pre(card);

	snd_soc_card_resume_pre(card);



	for_each_card_components(card, component) {

		if (snd_soc_component_is_suspended(component))

CRA Git | Maintained and supported by SUSTech CRA and CCSE