]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: SOF: ipc4-topology: Simplify match format print in sof_ipc4_init_input_audio_fmt()
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Tue, 8 Oct 2024 11:09:32 +0000 (14:09 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 8 Oct 2024 12:28:39 +0000 (13:28 +0100)
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: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20241008110936.22534-5-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/ipc4-topology.c

index 1f10926921d54fe1521f6cd6012bd922efa4ce43..31cbb7f620fd65ab277fd5326680d2d4df8fc2d8 100644 (file)
@@ -1305,11 +1305,8 @@ 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) {
@@ -1326,7 +1323,14 @@ in_fmt:
        /* 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;