Commit cfd9b5fb authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-dai: add snd_soc_dai_probe()

Current ALSA SoC is directly using dai->driver->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_probe() and use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k1cahn26.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 24b09d05
...@@ -164,6 +164,7 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai, ...@@ -164,6 +164,7 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
void snd_soc_dai_suspend(struct snd_soc_dai *dai); void snd_soc_dai_suspend(struct snd_soc_dai *dai);
void snd_soc_dai_resume(struct snd_soc_dai *dai); void snd_soc_dai_resume(struct snd_soc_dai *dai);
int snd_soc_dai_probe(struct snd_soc_dai *dai);
struct snd_soc_dai_ops { struct snd_soc_dai_ops {
/* /*
......
...@@ -1434,19 +1434,18 @@ static int soc_probe_link_components(struct snd_soc_card *card, ...@@ -1434,19 +1434,18 @@ static int soc_probe_link_components(struct snd_soc_card *card,
static int soc_probe_dai(struct snd_soc_dai *dai, int order) static int soc_probe_dai(struct snd_soc_dai *dai, int order)
{ {
int ret;
if (dai->probed || if (dai->probed ||
dai->driver->probe_order != order) dai->driver->probe_order != order)
return 0; return 0;
if (dai->driver->probe) { ret = snd_soc_dai_probe(dai);
int ret = dai->driver->probe(dai);
if (ret < 0) { if (ret < 0) {
dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n", dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n",
dai->name, ret); dai->name, ret);
return ret; return ret;
} }
}
dai->probed = 1; dai->probed = 1;
......
...@@ -365,3 +365,10 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai) ...@@ -365,3 +365,10 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai)
if (dai->driver->resume) if (dai->driver->resume)
dai->driver->resume(dai); dai->driver->resume(dai);
} }
int snd_soc_dai_probe(struct snd_soc_dai *dai)
{
if (dai->driver->probe)
return dai->driver->probe(dai);
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment