Unverified Commit 9182f3c4 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Drop ctrl_cmd parameter for snd_sof_ipc_set_get_comp_data() 



The scontrol->control_data->cmd has been configured during initialization
to the correct sof_ipc_ctrl_cmd.

No need to pass duplicated information, let's use the already available
one via scontrol.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20211215180404.53254-5-ranjani.sridharan@linux.intel.com


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

sound/soc/sof/control.c

+7 −19
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ static void snd_sof_refresh_control(struct snd_sof_control *scontrol) 
	/* refresh the component data from DSP */

	scontrol->comp_data_dirty = false;

	ret = snd_sof_ipc_set_get_comp_data(scontrol,

					    SOF_CTRL_TYPE_VALUE_CHAN_GET,

					    scontrol->cmd, false);

					    SOF_CTRL_TYPE_VALUE_CHAN_GET, false);

	if (ret < 0) {

		dev_err(scomp->dev, "error: failed to get control data: %d\n", ret);

		/* Set the flag to re-try next time to get the data */
@@ -137,9 +136,7 @@ int snd_sof_volume_put(struct snd_kcontrol *kcontrol, 
	/* notify DSP of mixer updates */

	if (pm_runtime_active(scomp->dev))

		snd_sof_ipc_set_get_comp_data(scontrol,

					      SOF_CTRL_TYPE_VALUE_CHAN_SET,

					      SOF_CTRL_CMD_VOLUME,

					      true);

					      SOF_CTRL_TYPE_VALUE_CHAN_SET, true);

	return change;

}
@@ -209,9 +206,7 @@ int snd_sof_switch_put(struct snd_kcontrol *kcontrol, 
	/* notify DSP of mixer updates */

	if (pm_runtime_active(scomp->dev))

		snd_sof_ipc_set_get_comp_data(scontrol,

					      SOF_CTRL_TYPE_VALUE_CHAN_SET,

					      SOF_CTRL_CMD_SWITCH,

					      true);

					      SOF_CTRL_TYPE_VALUE_CHAN_SET, true);



	return change;

}
@@ -257,9 +252,7 @@ int snd_sof_enum_put(struct snd_kcontrol *kcontrol, 
	/* notify DSP of enum updates */

	if (pm_runtime_active(scomp->dev))

		snd_sof_ipc_set_get_comp_data(scontrol,

					      SOF_CTRL_TYPE_VALUE_CHAN_SET,

					      SOF_CTRL_CMD_ENUM,

					      true);

					      SOF_CTRL_TYPE_VALUE_CHAN_SET, true);



	return change;

}
@@ -334,9 +327,7 @@ int snd_sof_bytes_put(struct snd_kcontrol *kcontrol, 
	/* notify DSP of byte control updates */

	if (pm_runtime_active(scomp->dev))

		snd_sof_ipc_set_get_comp_data(scontrol,

					      SOF_CTRL_TYPE_DATA_SET,

					      scontrol->cmd,

					      true);

					      SOF_CTRL_TYPE_DATA_SET, true);



	return 0;

}
@@ -413,9 +404,7 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol, 
	/* notify DSP of byte control updates */

	if (pm_runtime_active(scomp->dev))

		snd_sof_ipc_set_get_comp_data(scontrol,

					      SOF_CTRL_TYPE_DATA_SET,

					      scontrol->cmd,

					      true);

					      SOF_CTRL_TYPE_DATA_SET, true);



	return 0;

}
@@ -452,8 +441,7 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _ 
	cdata->data->magic = SOF_ABI_MAGIC;

	cdata->data->abi = SOF_ABI_VERSION;

	/* get all the component data from DSP */

	ret = snd_sof_ipc_set_get_comp_data(scontrol, SOF_CTRL_TYPE_DATA_GET,

					    scontrol->cmd, false);

	ret = snd_sof_ipc_set_get_comp_data(scontrol, SOF_CTRL_TYPE_DATA_GET, false);

	if (ret < 0)

		goto out;

sound/soc/sof/ipc.c

+2 −4
Original line number Diff line number Diff line
@@ -817,8 +817,7 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, 
 * IPC get()/set() for kcontrols.

 */

int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,

				  enum sof_ipc_ctrl_type ctrl_type,

				  enum sof_ipc_ctrl_cmd ctrl_cmd, bool set)

				  enum sof_ipc_ctrl_type ctrl_type, bool set)

{

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;
@@ -874,13 +873,12 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol, 
	}



	/* Select the IPC cmd based on the ctrl_cmd and the direction */

	if (ctrl_cmd == SOF_CTRL_CMD_BINARY)

	if (cdata->cmd == SOF_CTRL_CMD_BINARY)

		ipc_cmd = set ? SOF_IPC_COMP_SET_DATA : SOF_IPC_COMP_GET_DATA;

	else

		ipc_cmd = set ? SOF_IPC_COMP_SET_VALUE : SOF_IPC_COMP_GET_VALUE;



	cdata->rhdr.hdr.cmd = SOF_IPC_GLB_COMP_MSG | ipc_cmd;

	cdata->cmd = ctrl_cmd;

	cdata->type = ctrl_type;

	cdata->comp_id = scontrol->comp_id;

	cdata->msg_index = 0;

sound/soc/sof/sof-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int sof_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_sof_control * 
		return 0;

	}



	ret = snd_sof_ipc_set_get_comp_data(scontrol, ctrl_type, scontrol->cmd, true);

	ret = snd_sof_ipc_set_get_comp_data(scontrol, ctrl_type, true);

	if (ret < 0)

		dev_err(sdev->dev, "error: failed kcontrol value set for widget: %d\n",

			scontrol->comp_id);

sound/soc/sof/sof-audio.h

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ static inline void snd_sof_compr_init_elapsed_work(struct work_struct *work) { } 
 * Mixer IPC

 */

int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,

				  enum sof_ipc_ctrl_type ctrl_type,

				  enum sof_ipc_ctrl_cmd ctrl_cmd, bool set);

				  enum sof_ipc_ctrl_type ctrl_type, bool set);



/* DAI link fixup */

int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params);