UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-card: add snd_soc_card_probe() 

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

One note here is that card has "card->probe" and "card->late_probe"
callbacks.
Because it needs to care "late_probe", "card->probed" flag is set
under if (card->probe) at snd_soc_card_probe().

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/87wo4wzv54.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-05-28 10:49:11 +09:00 committed by Mark Brown
parent 27f07cacc9
commit 73de4b0268
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc-card.h
View File

@ -24,6 +24,8 @@ int snd_soc_card_suspend_post(struct snd_soc_card *card);
int snd_soc_card_resume_pre(struct snd_soc_card *card);
int snd_soc_card_resume_post(struct snd_soc_card *card);
int snd_soc_card_probe(struct snd_soc_card *card);
/* device driver data */
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
void *data)

23
sound/soc/soc-card.c
View File

@ -119,3 +119,26 @@ int snd_soc_card_resume_post(struct snd_soc_card *card)
return soc_card_ret(card, ret);
}
int snd_soc_card_probe(struct snd_soc_card *card)
{
if (card->probe) {
int ret = card->probe(card);
if (ret < 0)
return soc_card_ret(card, ret);
/*
* It has "card->probe" and "card->late_probe" callbacks.
* So, set "probed" flag here, because it needs to care
* about "late_probe".
*
* see
* snd_soc_bind_card()
* snd_soc_card_late_probe()
*/
card->probed = 1;
}
return 0;
}

9
sound/soc/soc-core.c
View File

@ -1825,12 +1825,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
goto probe_end;
/* initialise the sound card only once */
if (card->probe) {
ret = card->probe(card);
if (ret < 0)
goto probe_end;
card->probed = 1;
}
ret = snd_soc_card_probe(card);
if (ret < 0)
goto probe_end;
/* probe all components used by DAI links on this card */
ret = soc_probe_link_components(card);