Skip to content

Commit

Permalink
ASoC: soc-pcm: add soc_rtd_trigger()
Browse files Browse the repository at this point in the history
Add soc_rtd_trigger() to make the code easier to read

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/871rrsmi9j.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jan 23, 2020
1 parent 49f020e commit ad2bf9f
Showing 1 changed file with 16 additions and 10 deletions.
26 changes: 16 additions & 10 deletions sound/soc/soc-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ static void soc_rtd_hw_free(struct snd_soc_pcm_runtime *rtd,
rtd->dai_link->ops->hw_free(substream);
}

static int soc_rtd_trigger(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_substream *substream,
int cmd)
{
if (rtd->dai_link->ops &&
rtd->dai_link->ops->trigger)
return rtd->dai_link->ops->trigger(substream, cmd);
return 0;
}

/**
* snd_soc_runtime_activate() - Increment active count for PCM runtime components
* @rtd: ASoC PCM runtime that is activated
Expand Down Expand Up @@ -1013,11 +1023,9 @@ static int soc_pcm_trigger_start(struct snd_pcm_substream *substream, int cmd)
struct snd_soc_dai *codec_dai;
int i, ret;

if (rtd->dai_link->ops->trigger) {
ret = rtd->dai_link->ops->trigger(substream, cmd);
if (ret < 0)
return ret;
}
ret = soc_rtd_trigger(rtd, substream, cmd);
if (ret < 0)
return ret;

for_each_rtd_components(rtd, i, component) {
ret = snd_soc_component_trigger(component, substream, cmd);
Expand Down Expand Up @@ -1062,11 +1070,9 @@ static int soc_pcm_trigger_stop(struct snd_pcm_substream *substream, int cmd)
return ret;
}

if (rtd->dai_link->ops->trigger) {
ret = rtd->dai_link->ops->trigger(substream, cmd);
if (ret < 0)
return ret;
}
ret = soc_rtd_trigger(rtd, substream, cmd);
if (ret < 0)
return ret;

return 0;
}
Expand Down

0 comments on commit ad2bf9f

Please sign in to comment.