]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: SOF: ipc4-topology: Use local variables in sof_ipc4_init_input_audio_fmt()
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Tue, 8 Oct 2024 11:09:30 +0000 (14:09 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 8 Oct 2024 12:28:37 +0000 (13:28 +0100)
We have local copies of available_fmt->input_pin_fmts and
available_fmt->num_input_formats, use them in the function.

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-3-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/ipc4-topology.c

index 7967ec4c406ae3cc8c49680a0169fd4aafcd402b..af5eea853745d3731f1a9f609c01ab046d375db2 100644 (file)
@@ -1278,13 +1278,12 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
        int sample_valid_bits;
        int i = 0;
 
-       if (!available_fmt->num_input_formats) {
+       if (!pin_fmts_size) {
                dev_err(sdev->dev, "no input formats for %s\n", swidget->widget->name);
                return -EINVAL;
        }
 
-       single_format = sof_ipc4_is_single_format(sdev, available_fmt->input_pin_fmts,
-                                                 available_fmt->num_input_formats);
+       single_format = sof_ipc4_is_single_format(sdev, pin_fmts, pin_fmts_size);
        if (single_format)
                goto in_fmt;
 
@@ -1321,15 +1320,15 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
 
 in_fmt:
        /* copy input format */
-       if (available_fmt->num_input_formats && i < available_fmt->num_input_formats) {
-               memcpy(&base_config->audio_fmt, &available_fmt->input_pin_fmts[i].audio_fmt,
+       if (pin_fmts_size && i < pin_fmts_size) {
+               memcpy(&base_config->audio_fmt, &pin_fmts[i].audio_fmt,
                       sizeof(struct sof_ipc4_audio_format));
 
                /* set base_cfg ibs/obs */
-               base_config->ibs = available_fmt->input_pin_fmts[i].buffer_size;
+               base_config->ibs = pin_fmts[i].buffer_size;
 
                dev_dbg(sdev->dev, "Init input audio formats for %s\n", swidget->widget->name);
-               sof_ipc4_dbg_audio_format(sdev->dev, &available_fmt->input_pin_fmts[i], 1);
+               sof_ipc4_dbg_audio_format(sdev->dev, &pin_fmts[i], 1);
        }
 
        return i;