diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-05-28 04:49:20 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-30 04:11:37 +0300 |
| commit | 5c0eac036dfd3e20dd09ab86343c3b2fb2a1ac86 (patch) | |
| tree | a03d29c3d5546a3f73af18fd306eb2525746b15e /sound/soc/soc-core.c | |
| parent | 73de4b026850da432b8bcfb73fc4af94674a8102 (diff) | |
| download | linux-5c0eac036dfd3e20dd09ab86343c3b2fb2a1ac86.tar.xz | |
ASoC: soc-card: add snd_soc_card_late_probe()
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>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 13a7d5158534..42e8c11a0b26 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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); |