ASoC: fsl_asrc_dma: Use managed buffer allocation
This patch simplifies the buffer pre-allocation code of fsl_asrc_dma driver with the standard managed buffer helper. It uses the newly introduced fixed-size buffer allocation helper. Cc: Nicolin Chen <nicoleotsuka@gmail.com> Cc: Xiubo Li <Xiubo.Lee@gmail.com> Cc: Fabio Estevam <festevam@gmail.com> Cc: Shengjiu Wang <shengjiu.wang@gmail.com> Acked-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20210802072815.13551-11-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
189364872f
Коммит
1855ce6293
|
@ -284,8 +284,6 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
|
|||
return ret;
|
||||
}
|
||||
|
||||
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -297,8 +295,6 @@ static int fsl_asrc_dma_hw_free(struct snd_soc_component *component,
|
|||
struct fsl_asrc_pair *pair = runtime->private_data;
|
||||
u8 dir = tx ? OUT : IN;
|
||||
|
||||
snd_pcm_set_runtime_buffer(substream, NULL);
|
||||
|
||||
if (pair->dma_chan[!dir])
|
||||
dma_release_channel(pair->dma_chan[!dir]);
|
||||
|
||||
|
@ -423,9 +419,8 @@ static int fsl_asrc_dma_pcm_new(struct snd_soc_component *component,
|
|||
struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_card *card = rtd->card->snd_card;
|
||||
struct snd_pcm_substream *substream;
|
||||
struct snd_pcm *pcm = rtd->pcm;
|
||||
int ret, i;
|
||||
int ret;
|
||||
|
||||
ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
|
||||
if (ret) {
|
||||
|
@ -433,43 +428,8 @@ static int fsl_asrc_dma_pcm_new(struct snd_soc_component *component,
|
|||
return ret;
|
||||
}
|
||||
|
||||
for_each_pcm_streams(i) {
|
||||
substream = pcm->streams[i].substream;
|
||||
if (!substream)
|
||||
continue;
|
||||
|
||||
ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev,
|
||||
FSL_ASRC_DMABUF_SIZE, &substream->dma_buffer);
|
||||
if (ret) {
|
||||
dev_err(card->dev, "failed to allocate DMA buffer\n");
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err:
|
||||
if (--i == 0 && pcm->streams[i].substream)
|
||||
snd_dma_free_pages(&pcm->streams[i].substream->dma_buffer);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void fsl_asrc_dma_pcm_free(struct snd_soc_component *component,
|
||||
struct snd_pcm *pcm)
|
||||
{
|
||||
struct snd_pcm_substream *substream;
|
||||
int i;
|
||||
|
||||
for_each_pcm_streams(i) {
|
||||
substream = pcm->streams[i].substream;
|
||||
if (!substream)
|
||||
continue;
|
||||
|
||||
snd_dma_free_pages(&substream->dma_buffer);
|
||||
substream->dma_buffer.area = NULL;
|
||||
substream->dma_buffer.addr = 0;
|
||||
}
|
||||
return snd_pcm_set_fixed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
|
||||
card->dev, FSL_ASRC_DMABUF_SIZE);
|
||||
}
|
||||
|
||||
struct snd_soc_component_driver fsl_asrc_component = {
|
||||
|
@ -481,6 +441,5 @@ struct snd_soc_component_driver fsl_asrc_component = {
|
|||
.close = fsl_asrc_dma_shutdown,
|
||||
.pointer = fsl_asrc_dma_pcm_pointer,
|
||||
.pcm_construct = fsl_asrc_dma_pcm_new,
|
||||
.pcm_destruct = fsl_asrc_dma_pcm_free,
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(fsl_asrc_component);
|
||||
|
|
Загрузка…
Ссылка в новой задаче