ASoC: SOF: ipc4-control: set_volume_data only applies to VOLSW family

Make sure sof_ipc4_set_volume_data() is only called for the
SND_SOC_TPLG_CTL_VOLSW, SND_SOC_TPLG_CTL_VOLSW_SX and
SND_SOC_TPLG_CTL_VOLSW_XR_SX info_type.

Signed-off-by: Libin Yang <libin.yang@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230313110344.16644-6-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc4-control.c b/sound/soc/sof/ipc4-control.c
index 67bd223..c978325 100644 (file)
--- a/sound/soc/sof/ipc4-control.c
+++ b/sound/soc/sof/ipc4-control.c
@@ -186,15 +186,25 @@ static int sof_ipc4_widget_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_s
        struct snd_sof_control *scontrol;
        int ret;
 
-       list_for_each_entry(scontrol, &sdev->kcontrol_list, list)
+       list_for_each_entry(scontrol, &sdev->kcontrol_list, list) {
                if (scontrol->comp_id == swidget->comp_id) {
-                       ret = sof_ipc4_set_volume_data(sdev, swidget, scontrol, false);
-                       if (ret < 0) {
-                               dev_err(sdev->dev, "%s: kcontrol %d set up failed for widget %s\n",
-                                       __func__, scontrol->comp_id, swidget->widget->name);
-                               return ret;
+                       switch (scontrol->info_type) {
+                       case SND_SOC_TPLG_CTL_VOLSW:
+                       case SND_SOC_TPLG_CTL_VOLSW_SX:
+                       case SND_SOC_TPLG_CTL_VOLSW_XR_SX:
+                               ret = sof_ipc4_set_volume_data(sdev, swidget,
+                                                              scontrol, false);
+                               if (ret < 0) {
+                                       dev_err(sdev->dev, "kcontrol %d set up failed for widget %s\n",
+                                               scontrol->comp_id, swidget->widget->name);
+                                       return ret;
+                               }
+                               break;
+                       default:
+                               break;
                        }
                }
+       }
 
        return 0;
 }