hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: meson: Use managed buffer allocation 

Clean up the driver with the new managed buffer allocation API.
The superfluous snd_pcm_lib_malloc_pages() and
snd_pcm_lib_free_pages() calls are dropped.

Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20191210142614.19405-6-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Takashi Iwai 2019-12-10 15:25:56 +01:00 committed by Mark Brown
parent fcf306efab
commit bace3caa82
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/meson/axg-fifo.c
View File

@ -115,11 +115,6 @@ int axg_fifo_pcm_hw_params(struct snd_soc_component *component,
struct axg_fifo *fifo = axg_fifo_data(ss); struct axg_fifo *fifo = axg_fifo_data(ss);
dma_addr_t end_ptr; dma_addr_t end_ptr;
unsigned int burst_num; unsigned int burst_num;
int ret;
ret = snd_pcm_lib_malloc_pages(ss, params_buffer_bytes(params));
if (ret < 0)
return ret;
/* Setup dma memory pointers */ /* Setup dma memory pointers */
end_ptr = runtime->dma_addr + runtime->dma_bytes - AXG_FIFO_BURST; end_ptr = runtime->dma_addr + runtime->dma_bytes - AXG_FIFO_BURST;
@ -167,7 +162,7 @@ int axg_fifo_pcm_hw_free(struct snd_soc_component *component,
regmap_update_bits(fifo->map, FIFO_CTRL0, regmap_update_bits(fifo->map, FIFO_CTRL0,
CTRL0_INT_EN(FIFO_INT_COUNT_REPEAT), 0); CTRL0_INT_EN(FIFO_INT_COUNT_REPEAT), 0);
return snd_pcm_lib_free_pages(ss); return 0;
} }
EXPORT_SYMBOL_GPL(axg_fifo_pcm_hw_free); EXPORT_SYMBOL_GPL(axg_fifo_pcm_hw_free);
@ -287,9 +282,9 @@ int axg_fifo_pcm_new(struct snd_soc_pcm_runtime *rtd, unsigned int type)
struct snd_card *card = rtd->card->snd_card; struct snd_card *card = rtd->card->snd_card;
size_t size = axg_fifo_hw.buffer_bytes_max; size_t size = axg_fifo_hw.buffer_bytes_max;
snd_pcm_lib_preallocate_pages(rtd->pcm->streams[type].substream, snd_pcm_set_managed_buffer(rtd->pcm->streams[type].substream,
SNDRV_DMA_TYPE_DEV, card->dev, SNDRV_DMA_TYPE_DEV, card->dev,
size, size); size, size);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(axg_fifo_pcm_new); EXPORT_SYMBOL_GPL(axg_fifo_pcm_new);