UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: SOF: pcm: Remove sof_pcm_dsp_params() wrapper 

Call directly for snd_sof_ipc_pcm_params() from sof_pcm_hw_params() and
remove the wrapper for it.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220310042720.976809-4-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2022-03-09 20:27:13 -08:00 committed by Mark Brown
parent 31f60a0c94
commit d1b1146fc7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/sof/pcm.c
View File

@ -36,22 +36,6 @@ static int create_page_table(struct snd_soc_component *component,
spcm->stream[stream].page_table.area, size);
}
static int sof_pcm_dsp_params(struct snd_sof_pcm *spcm, struct snd_pcm_substream *substream,
const struct sof_ipc_pcm_params_reply *reply)
{
struct snd_soc_component *scomp = spcm->scomp;
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
/* validate offset */
int ret = snd_sof_ipc_pcm_params(sdev, substream, reply);
if (ret < 0)
dev_err(scomp->dev, "error: got wrong reply for PCM %d\n",
spcm->pcm.pcm_id);
return ret;
}
/*
* sof pcm period elapse work
*/
@ -285,9 +269,12 @@ static int sof_pcm_hw_params(struct snd_soc_component *component,
return ret;
}
ret = sof_pcm_dsp_params(spcm, substream, &ipc_params_reply);
if (ret < 0)
ret = snd_sof_ipc_pcm_params(sdev, substream, &ipc_params_reply);
if (ret < 0) {
dev_err(component->dev, "%s: got wrong reply for PCM %d\n",
__func__, spcm->pcm.pcm_id);
return ret;
}
spcm->prepared[substream->stream] = true;