Unverified Commit 836367be authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: merge soc_pcm_trigger_start/stop() 



Now, soc_pcm_trigger_start/stop() are simple enough.
Let's merge these into soc_pcm_trigger().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87ftbbw8wj.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 460b42d1

sound/soc/soc-pcm.c

+19 −39
Original line number Diff line number Diff line
@@ -1072,57 +1072,37 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) 
	return 0;

}



static int soc_pcm_trigger_start(struct snd_pcm_substream *substream, int cmd)

static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)

{

	int ret;

	int ret = -EINVAL;



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		ret = snd_soc_link_trigger(substream, cmd);

		if (ret < 0)

		return ret;

			break;



		ret = snd_soc_pcm_component_trigger(substream, cmd);

		if (ret < 0)

		return ret;



	return snd_soc_pcm_dai_trigger(substream, cmd);

}



static int soc_pcm_trigger_stop(struct snd_pcm_substream *substream, int cmd)

{

	int ret;

			break;



		ret = snd_soc_pcm_dai_trigger(substream, cmd);

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		ret = snd_soc_pcm_dai_trigger(substream, cmd);

		if (ret < 0)

		return ret;

			break;



		ret = snd_soc_pcm_component_trigger(substream, cmd);

		if (ret < 0)

		return ret;

			break;



		ret = snd_soc_link_trigger(substream, cmd);

	if (ret < 0)

		return ret;



	return 0;

}



static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)

{

	int ret;



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		ret = soc_pcm_trigger_start(substream, cmd);

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		ret = soc_pcm_trigger_stop(substream, cmd);

		break;

	default:

		return -EINVAL;

	}



	return ret;