ASoC: Intel: Skylake: Drop pipe_config_idx

Field ->pipe_config_idx duplicates the job of ->cur_config_idx so
remove it.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Tested-by: Lukasz Majczak <lma@semihlaf.com>
Link: https://lore.kernel.org/r/20221205085330.857665-4-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index f144acae1b440b029c4308185e62e3c5ad1dfa72..567a3b661ce4c9e42097f6a38f4a152bee532dea 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1351,9 +1351,9 @@ static int skl_tplg_multi_config_set_get(struct snd_kcontrol *kcontrol,
                return -EIO;
 
        if (is_set)
-               pipe->pipe_config_idx = ucontrol->value.enumerated.item[0];
+               pipe->cur_config_idx = ucontrol->value.enumerated.item[0];
        else
-               ucontrol->value.enumerated.item[0]  =  pipe->pipe_config_idx;
+               ucontrol->value.enumerated.item[0] = pipe->cur_config_idx;
 
        return 0;
 }
@@ -1814,11 +1814,11 @@ static int skl_tplg_be_fill_pipe_params(struct snd_soc_dai *dai,
        if (ret)
                goto err;
 
-       dev_dbg(skl->dev, "%s using pipe config: %d\n", __func__, pipe->pipe_config_idx);
+       dev_dbg(skl->dev, "%s using pipe config: %d\n", __func__, pipe->cur_config_idx);
        if (pipe->direction == SNDRV_PCM_STREAM_PLAYBACK)
-               pipe_fmt = &pipe->configs[pipe->pipe_config_idx].out_fmt;
+               pipe_fmt = &pipe->configs[pipe->cur_config_idx].out_fmt;
        else
-               pipe_fmt = &pipe->configs[pipe->pipe_config_idx].in_fmt;
+               pipe_fmt = &pipe->configs[pipe->cur_config_idx].in_fmt;
 
        /* update the blob based on virtual bus_id*/
        cfg = intel_nhlt_get_endpoint_blob(dai->dev, skl->nhlt,

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 017ac0ef324ddd65a20e4c3436485cdac1c57b99..6db0fd7bad49cdda8409f2333e79ff36b6fbd5f9 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -324,7 +324,6 @@ struct skl_pipe {
        struct skl_path_config configs[SKL_MAX_PATH_CONFIGS];
        struct list_head w_list;
        bool passthru;
-       u32 pipe_config_idx;
 };
 
 enum skl_module_state {