leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: soc-card: add snd_soc_card_late_probe()

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

card has "card->probe" and "card->late_probe" callbacks,
and "late_probe" callback is called after "probe".
This means, we can set "card->probed" flag afer "late_probe"
for all cases.

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/87v9kgzv4w.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:20 +09:00 committed by Mark Brown
parent 73de4b0268
commit 5c0eac036d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ 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);
int snd_soc_card_late_probe(struct snd_soc_card *card);
/* device driver data */
static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

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

@ -142,3 +142,27 @@ int snd_soc_card_probe(struct snd_soc_card *card)
return 0;
}
int snd_soc_card_late_probe(struct snd_soc_card *card)
{
if (card->late_probe) {
int ret = card->late_probe(card);
if (ret < 0)
return soc_card_ret(card, ret);
}
/*
* It has "card->probe" and "card->late_probe" callbacks,
* and "late_probe" callback is called after "probe".
* This means, we can set "card->probed" flag afer "late_probe"
* for all cases.
*
* see
* snd_soc_bind_card()
* snd_soc_card_probe()
*/
card->probed = 1;
return 0;
}

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

@ -1910,15 +1910,9 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
}
}
if (card->late_probe) {
ret = card->late_probe(card);
if (ret < 0) {
dev_err(card->dev, "ASoC: %s late_probe() failed: %d\n",
card->name, ret);
goto probe_end;
}
}
card->probed = 1;
ret = snd_soc_card_late_probe(card);
if (ret < 0)
goto probe_end;
snd_soc_dapm_new_widgets(card);