Unverified Commit 25c2f515 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm: use defined stream 



Many functions defines "stream = substream->stream", but
some of them is using "substream->stream" instead of "stream".
It is pointless. This patch uses defined stream.

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


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

sound/soc/soc-pcm.c

+7 −8
Original line number Diff line number Diff line
@@ -644,8 +644,7 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
		 * bailed out on a higher level, since there would be no

		 * CODEC to support the transfer direction in that case.

		 */

		if (!snd_soc_dai_stream_valid(codec_dai,

					      substream->stream))

		if (!snd_soc_dai_stream_valid(codec_dai, stream))

			continue;



		codec_stream = snd_soc_dai_get_pcm_stream(codec_dai, stream);
@@ -2149,7 +2148,7 @@ static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream) 


	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);



	ret = dpcm_be_dai_startup(fe, fe_substream->stream);

	ret = dpcm_be_dai_startup(fe, stream);

	if (ret < 0) {

		dev_err(fe->dev,"ASoC: failed to start some BEs %d\n", ret);

		goto be_err;
@@ -2180,7 +2179,7 @@ static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream) 
	return 0;



unwind:

	dpcm_be_dai_startup_unwind(fe, fe_substream->stream);

	dpcm_be_dai_startup_unwind(fe, stream);

be_err:

	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);

	return ret;
@@ -2234,7 +2233,7 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream) 
	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);



	/* shutdown the BEs */

	dpcm_be_dai_shutdown(fe, substream->stream);

	dpcm_be_dai_shutdown(fe, stream);



	dev_dbg(fe->dev, "ASoC: close FE %s\n", fe->dai_link->name);
@@ -2412,9 +2411,9 @@ static int dpcm_fe_dai_hw_params(struct snd_pcm_substream *substream, 
	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);



	memcpy(&fe->dpcm[substream->stream].hw_params, params,

	memcpy(&fe->dpcm[stream].hw_params, params,

			sizeof(struct snd_pcm_hw_params));

	ret = dpcm_be_dai_hw_params(fe, substream->stream);

	ret = dpcm_be_dai_hw_params(fe, stream);

	if (ret < 0) {

		dev_err(fe->dev,"ASoC: hw_params BE failed %d\n", ret);

		goto out;
@@ -2736,7 +2735,7 @@ static int dpcm_fe_dai_prepare(struct snd_pcm_substream *substream) 
		goto out;

	}



	ret = dpcm_be_dai_prepare(fe, substream->stream);

	ret = dpcm_be_dai_prepare(fe, stream);

	if (ret < 0)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE