Unverified Commit 75ab3c00 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Drop pipe_config_idx 



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

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Tested-by: default avatarLukasz Majczak <lma@semihlaf.com>
Link: https://lore.kernel.org/r/20221205085330.857665-4-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b0d16e54

sound/soc/intel/skylake/skl-topology.c

+5 −5
Original line number Diff line number Diff line
@@ -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,

sound/soc/intel/skylake/skl-topology.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {