ASoC: SOF: sof-audio: Drop the cmd member from struct snd_sof_control
There is no need to use two variables to store and check the same information, the scontrol->cmd is the same as scontrol->control_data->cmd. Drop the former one and when it is needed, access the cmd from the control_data. 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: Kai Vehmanen <kai.vehmanen@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/20211215180404.53254-6-ranjani.sridharan@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
committed by
Mark Brown
parent
9182f3c40b
commit
dd2fef982f
@@ -372,7 +372,7 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol,
|
||||
}
|
||||
|
||||
/* Check that header id matches the command */
|
||||
if (header.numid != scontrol->cmd) {
|
||||
if (header.numid != cdata->cmd) {
|
||||
dev_err_ratelimited(scomp->dev,
|
||||
"error: incorrect numid %d\n",
|
||||
header.numid);
|
||||
@@ -462,7 +462,7 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _
|
||||
goto out;
|
||||
}
|
||||
|
||||
header.numid = scontrol->cmd;
|
||||
header.numid = cdata->cmd;
|
||||
header.length = data_size;
|
||||
if (copy_to_user(tlvd, &header, sizeof(struct snd_ctl_tlv))) {
|
||||
ret = -EFAULT;
|
||||
@@ -522,7 +522,7 @@ int snd_sof_bytes_ext_get(struct snd_kcontrol *kcontrol,
|
||||
if (data_size > size)
|
||||
return -ENOSPC;
|
||||
|
||||
header.numid = scontrol->cmd;
|
||||
header.numid = cdata->cmd;
|
||||
header.length = data_size;
|
||||
if (copy_to_user(tlvd, &header, sizeof(struct snd_ctl_tlv)))
|
||||
return -EFAULT;
|
||||
|
||||
Reference in New Issue
Block a user