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

ASoC: soc-pcm: add soc_rtd_hw_params() 



Add soc_rtd_hw_params() to make the code easier to read

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


Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 44c1a75b

sound/soc/soc-pcm.c

+15 −7
Original line number Diff line number Diff line
@@ -54,6 +54,16 @@ static int soc_rtd_prepare(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



static int soc_rtd_hw_params(struct snd_soc_pcm_runtime *rtd,

			     struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *params)

{

	if (rtd->dai_link->ops &&

	    rtd->dai_link->ops->hw_params)

		return rtd->dai_link->ops->hw_params(substream, params);

	return 0;

}



/**

 * snd_soc_runtime_activate() - Increment active count for PCM runtime components

 * @rtd: ASoC PCM runtime that is activated
@@ -826,14 +836,12 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
	if (ret)

		goto out;



	if (rtd->dai_link->ops->hw_params) {

		ret = rtd->dai_link->ops->hw_params(substream, params);

	ret = soc_rtd_hw_params(rtd, substream, params);

	if (ret < 0) {

			dev_err(rtd->card->dev, "ASoC: machine hw_params"

				" failed: %d\n", ret);

		dev_err(rtd->card->dev,

			"ASoC: machine hw_params failed: %d\n", ret);

		goto out;

	}

	}



	for_each_rtd_codec_dai(rtd, i, codec_dai) {

		struct snd_pcm_hw_params codec_params;

CRA Git | Maintained and supported by SUSTech CRA and CCSE