Commit 95aef355 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-dai: add snd_soc_dai_trigger()

Current ALSA SoC is directly using dai->driver->ops->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_trigger() and use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87sgqyhn40.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4beb8e10
...@@ -156,6 +156,8 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai, ...@@ -156,6 +156,8 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_dai_prepare(struct snd_soc_dai *dai, int snd_soc_dai_prepare(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_dai_trigger(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream, int cmd);
struct snd_soc_dai_ops { struct snd_soc_dai_ops {
/* /*
......
...@@ -318,3 +318,15 @@ int snd_soc_dai_prepare(struct snd_soc_dai *dai, ...@@ -318,3 +318,15 @@ int snd_soc_dai_prepare(struct snd_soc_dai *dai,
return ret; return ret;
} }
int snd_soc_dai_trigger(struct snd_soc_dai *dai,
struct snd_pcm_substream *substream,
int cmd)
{
int ret = 0;
if (dai->driver->ops->trigger)
ret = dai->driver->ops->trigger(substream, cmd, dai);
return ret;
}
...@@ -1084,13 +1084,10 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -1084,13 +1084,10 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
int i, ret; int i, ret;
for_each_rtd_codec_dai(rtd, i, codec_dai) { for_each_rtd_codec_dai(rtd, i, codec_dai) {
if (codec_dai->driver->ops->trigger) { ret = snd_soc_dai_trigger(codec_dai, substream, cmd);
ret = codec_dai->driver->ops->trigger(substream,
cmd, codec_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
}
for_each_rtdcom(rtd, rtdcom) { for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component; component = rtdcom->component;
...@@ -1104,11 +1101,9 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -1104,11 +1101,9 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
return ret; return ret;
} }
if (cpu_dai->driver->ops->trigger) { snd_soc_dai_trigger(cpu_dai, substream, cmd);
ret = cpu_dai->driver->ops->trigger(substream, cmd, cpu_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
if (rtd->dai_link->ops->trigger) { if (rtd->dai_link->ops->trigger) {
ret = rtd->dai_link->ops->trigger(substream, cmd); ret = rtd->dai_link->ops->trigger(substream, cmd);
......
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