Unverified Commit 8d6258a4 authored Sep 18, 2018 by Kuninori Morimoto Committed by Mark Brown Sep 20, 2018

ASoC: add for_each_dpcm_be() macro



To be more readable code, this patch adds
new for_each_dpcm_be() macro, and replace existing code to it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent d2e24d64

include/sound/soc-dpcm.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,13 @@ struct snd_soc_dpcm_runtime {
		#define for_each_dpcm_fe(be, stream, dpcm) \
		list_for_each_entry(dpcm, &(be)->dpcm[stream].fe_clients, list_fe)

		#define for_each_dpcm_be(fe, stream, dpcm) \
		list_for_each_entry(dpcm, &(fe)->dpcm[stream].be_clients, list_be)
		#define for_each_dpcm_be_safe(fe, stream, dpcm, _dpcm) \
		list_for_each_entry_safe(dpcm, _dpcm, &(fe)->dpcm[stream].be_clients, list_be)
		#define for_each_dpcm_be_rollback(fe, stream, dpcm) \
		list_for_each_entry_continue_reverse(dpcm, &(fe)->dpcm[stream].be_clients, list_be)

		/* can this BE stop and free */
		int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,
		struct snd_soc_pcm_runtime *be, int stream);

sound/soc/fsl/fsl_asrc_dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ static int fsl_asrc_dma_hw_params(struct snd_pcm_substream *substream,
		int ret;

		/* Fetch the Back-End dma_data from DPCM */
		list_for_each_entry(dpcm, &rtd->dpcm[stream].be_clients, list_be) {
		for_each_dpcm_be(rtd, stream, dpcm) {
		struct snd_soc_pcm_runtime *be = dpcm->be;
		struct snd_pcm_substream *substream_be;
		struct snd_soc_dai *dai = be->cpu_dai;

sound/soc/sh/rcar/ctu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ static int rsnd_ctu_hw_params(struct rsnd_mod *mod,
		struct snd_pcm_hw_params *be_params;
		int stream = substream->stream;

		list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) {
		for_each_dpcm_be(fe, stream, dpcm) {
		be_params = &dpcm->hw_params;
		if (params_channels(fe_params) != params_channels(be_params))
		ctu->channels = params_channels(be_params);

sound/soc/sh/rcar/src.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ static int rsnd_src_hw_params(struct rsnd_mod *mod,
		struct snd_soc_dpcm *dpcm;
		struct snd_pcm_hw_params *be_params;

		list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) {
		for_each_dpcm_be(fe, stream, dpcm) {
		be_params = &dpcm->hw_params;

		if (params_rate(fe_params) != params_rate(be_params))

sound/soc/soc-compress.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
		ret = dpcm_be_dai_startup(fe, stream);
		if (ret < 0) {
		/* clean up all links */
		list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be)
		for_each_dpcm_be(fe, stream, dpcm)
		dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;

		dpcm_be_disconnect(fe, stream);
		@@ -321,7 +321,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
		ret = dpcm_be_dai_shutdown(fe, stream);

		/* mark FE's links ready to prune */
		list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be)
		for_each_dpcm_be(fe, stream, dpcm)
		dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);