]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: SOF: ipc4-topology: Remove redundant check in sof_ipc4_init_input_audio_fmt()
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Tue, 8 Oct 2024 11:09:31 +0000 (14:09 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 8 Oct 2024 12:28:38 +0000 (13:28 +0100)
At label in_fmt the if (pin_fmts_size && i < pin_fmts_size) is guarantied
to be true all the time, drop the check completely.

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

index af5eea853745d3731f1a9f609c01ab046d375db2..1f10926921d54fe1521f6cd6012bd922efa4ce43 100644 (file)
@@ -1320,16 +1320,14 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
 
 in_fmt:
        /* copy input format */
-       if (pin_fmts_size && i < pin_fmts_size) {
-               memcpy(&base_config->audio_fmt, &pin_fmts[i].audio_fmt,
-                      sizeof(struct sof_ipc4_audio_format));
+       memcpy(&base_config->audio_fmt, &pin_fmts[i].audio_fmt,
+              sizeof(struct sof_ipc4_audio_format));
 
-               /* set base_cfg ibs/obs */
-               base_config->ibs = pin_fmts[i].buffer_size;
+       /* 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);
-               sof_ipc4_dbg_audio_format(sdev->dev, &pin_fmts[i], 1);
-       }
+       dev_dbg(sdev->dev, "Init input audio formats for %s\n", swidget->widget->name);
+       sof_ipc4_dbg_audio_format(sdev->dev, &pin_fmts[i], 1);
 
        return i;
 }