Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: soc-pcm: do cpu_dai related operation at same place 



cpu_dai related operation is separated by component operation at
soc_pcm_hw_params() somehow.
It is not readable, let's do it at same place

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7426af50

sound/soc/soc-pcm.c

+8 −8
Original line number Diff line number Diff line
@@ -990,6 +990,14 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		goto interface_err;



	/* store the parameters for each DAIs */

	cpu_dai->rate = params_rate(params);

	cpu_dai->channels = params_channels(params);

	cpu_dai->sample_bits =

		snd_pcm_format_physical_width(params_format(params));



	snd_soc_dapm_update_dai(substream, params, cpu_dai);



	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;
@@ -1007,14 +1015,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
	}

	component = NULL;



	/* store the parameters for each DAIs */

	cpu_dai->rate = params_rate(params);

	cpu_dai->channels = params_channels(params);

	cpu_dai->sample_bits =

		snd_pcm_format_physical_width(params_format(params));



	snd_soc_dapm_update_dai(substream, params, cpu_dai);



	ret = soc_pcm_params_symmetry(substream, params);

        if (ret)

		goto component_err;