Unverified Commit 9c6d7f93 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm: move dpcm_set_fe_update_state() 



This patch moves dpcm_set_fe_update_state() to top side.
This is prepare for cleanup soc-pcm.c

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/871rfw99jn.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-pcm.c

+22 −23
Original line number Diff line number Diff line
@@ -203,6 +203,28 @@ static inline void dpcm_remove_debugfs_state(struct snd_soc_dpcm *dpcm) 
}

#endif



/* Set FE's runtime_update state; the state is protected via PCM stream lock

 * for avoiding the race with trigger callback.

 * If the state is unset and a trigger is pending while the previous operation,

 * process the pending trigger action here.

 */

static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd);

static void dpcm_set_fe_update_state(struct snd_soc_pcm_runtime *fe,

				     int stream, enum snd_soc_dpcm_update state)

{

	struct snd_pcm_substream *substream =

		snd_soc_dpcm_get_substream(fe, stream);



	snd_pcm_stream_lock_irq(substream);

	if (state == SND_SOC_DPCM_UPDATE_NO && fe->dpcm[stream].trigger_pending) {

		dpcm_fe_dai_do_trigger(substream,

				       fe->dpcm[stream].trigger_pending - 1);

		fe->dpcm[stream].trigger_pending = 0;

	}

	fe->dpcm[stream].runtime_update = state;

	snd_pcm_stream_unlock_irq(substream);

}



/**

 * snd_soc_runtime_action() - Increment/Decrement active count for

 * PCM runtime components
@@ -1710,29 +1732,6 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream) 
				&runtime->hw.rate_min, &runtime->hw.rate_max);

}



static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd);



/* Set FE's runtime_update state; the state is protected via PCM stream lock

 * for avoiding the race with trigger callback.

 * If the state is unset and a trigger is pending while the previous operation,

 * process the pending trigger action here.

 */

static void dpcm_set_fe_update_state(struct snd_soc_pcm_runtime *fe,

				     int stream, enum snd_soc_dpcm_update state)

{

	struct snd_pcm_substream *substream =

		snd_soc_dpcm_get_substream(fe, stream);



	snd_pcm_stream_lock_irq(substream);

	if (state == SND_SOC_DPCM_UPDATE_NO && fe->dpcm[stream].trigger_pending) {

		dpcm_fe_dai_do_trigger(substream,

				       fe->dpcm[stream].trigger_pending - 1);

		fe->dpcm[stream].trigger_pending = 0;

	}

	fe->dpcm[stream].runtime_update = state;

	snd_pcm_stream_unlock_irq(substream);

}



static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,

			       int stream)

{