Unverified Commit 0126a659 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: Simplify match format print in sof_ipc4_init_input_audio_fmt() 



Print out the information line for the found input format once to avoid
duplicated prints in case when multiple formats are available.

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


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

sound/soc/sof/ipc4-topology.c

+9 −5
Original line number Diff line number Diff line
@@ -1305,12 +1305,9 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev, 
		channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);

		valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);

		if (params_rate(params) == rate && params_channels(params) == channels &&

		    sample_valid_bits == valid_bits) {

			dev_dbg(sdev->dev, "matched audio format index for %uHz, %ubit, %u channels: %d\n",

				rate, valid_bits, channels, i);

		    sample_valid_bits == valid_bits)

			break;

	}

	}



	if (i == pin_fmts_size) {

		dev_err(sdev->dev, "%s: Unsupported audio format: %uHz, %ubit, %u channels\n",
@@ -1326,7 +1323,14 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev, 
	/* set base_cfg ibs/obs */

	base_config->ibs = pin_fmts[i].buffer_size;



	dev_dbg(sdev->dev, "Init input audio formats for %s\n", swidget->widget->name);

	if (single_format)

		dev_dbg(sdev->dev, "Input audio format for %s:\n",

			swidget->widget->name);

	else

		dev_dbg(sdev->dev,

			"Input audio format (format index: %d) for %s:\n", i,

			swidget->widget->name);



	sof_ipc4_dbg_audio_format(sdev->dev, &pin_fmts[i], 1);



	return i;