Unverified Commit ae45aebe authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: Rename sof_ipc4_init_audio_fmt() 



Rename it to sof_ipc4_init_input_audio_fmt() as it only does input
format selection now.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230515103336.16132-5-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/ipc4-topology.c

+26 −25
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ static int sof_ipc4_init_output_audio_fmt(struct snd_sof_dev *sdev, 
	return i;

}



static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,

static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,

					 struct snd_sof_widget *swidget,

					 struct sof_ipc4_base_module_cfg *base_config,

					 struct snd_pcm_hw_params *params,
@@ -1514,8 +1514,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
	}



	/* set input and output audio formats */

	ret = sof_ipc4_init_audio_fmt(sdev, swidget, &copier_data->base_config, ref_params,

				      available_fmt, format_list_to_search, format_list_count);

	ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &copier_data->base_config, ref_params,

					    available_fmt, format_list_to_search,

					    format_list_count);

	if (ret < 0)

		return ret;
@@ -1541,7 +1542,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
	{

		/*

		 * Only SOF_DAI_INTEL_ALH needs copier_data to set blob.

		 * That's why only ALH dai's blob is set after sof_ipc4_init_audio_fmt

		 * That's why only ALH dai's blob is set after sof_ipc4_init_input_audio_fmt

		 */

		if (ipc4_copier->dai_type == SOF_DAI_INTEL_ALH) {

			struct sof_ipc4_alh_configuration_blob *blob;
@@ -1692,7 +1693,7 @@ static int sof_ipc4_prepare_gain_module(struct snd_sof_widget *swidget, 
	struct sof_ipc4_available_audio_format *available_fmt = &gain->available_fmt;

	int ret;



	ret = sof_ipc4_init_audio_fmt(sdev, swidget, &gain->base_config,

	ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &gain->base_config,

					    pipeline_params, available_fmt,

					    available_fmt->input_pin_fmts,

					    available_fmt->num_input_formats);
@@ -1718,7 +1719,7 @@ static int sof_ipc4_prepare_mixer_module(struct snd_sof_widget *swidget, 
	struct sof_ipc4_available_audio_format *available_fmt = &mixer->available_fmt;

	int ret;



	ret = sof_ipc4_init_audio_fmt(sdev, swidget, &mixer->base_config,

	ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &mixer->base_config,

					    pipeline_params, available_fmt,

					    available_fmt->input_pin_fmts,

					    available_fmt->num_input_formats);
@@ -1745,7 +1746,7 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget, 
	struct snd_interval *rate;

	int ret;



	ret = sof_ipc4_init_audio_fmt(sdev, swidget, &src->base_config,

	ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &src->base_config,

					    pipeline_params, available_fmt,

					    available_fmt->input_pin_fmts,

					    available_fmt->num_input_formats);
@@ -1856,7 +1857,7 @@ static int sof_ipc4_prepare_process_module(struct snd_sof_widget *swidget, 
	int output_fmt_index;

	int ret;



	ret = sof_ipc4_init_audio_fmt(sdev, swidget, &process->base_config,

	ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &process->base_config,

					    pipeline_params, available_fmt,

					    available_fmt->input_pin_fmts,

					    available_fmt->num_input_formats);