leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: dummy: Use managed buffer allocation

Browse Source 
Clean up the driver with the new managed buffer allocation API.
The hw_free callback became superfluous and got dropped.

Link: https://lore.kernel.org/r/20191209094943.14984-6-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2019-12-09 10:48:37 +01:00
parent 39729889b1
commit ef1545b8f3
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/drivers/dummy.c
View File

@@ -529,15 +529,7 @@ static int dummy_pcm_hw_params(struct snd_pcm_substream *substream,
substream->runtime->dma_bytes = params_buffer_bytes(hw_params); substream->runtime->dma_bytes = params_buffer_bytes(hw_params);
return 0; return 0;
} }
return snd_pcm_lib_malloc_pages(substream, return 0;
params_buffer_bytes(hw_params));
}
static int dummy_pcm_hw_free(struct snd_pcm_substream *substream)
{
if (fake_buffer)
return 0;
return snd_pcm_lib_free_pages(substream);
} }
static int dummy_pcm_open(struct snd_pcm_substream *substream) static int dummy_pcm_open(struct snd_pcm_substream *substream)
@@ -657,7 +649,6 @@ static struct snd_pcm_ops dummy_pcm_ops = {
.close = dummy_pcm_close, .close = dummy_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = dummy_pcm_hw_params, .hw_params = dummy_pcm_hw_params,
.hw_free = dummy_pcm_hw_free,
.prepare = dummy_pcm_prepare, .prepare = dummy_pcm_prepare,
.trigger = dummy_pcm_trigger, .trigger = dummy_pcm_trigger,
.pointer = dummy_pcm_pointer, .pointer = dummy_pcm_pointer,
@@ -668,7 +659,6 @@ static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
.close = dummy_pcm_close, .close = dummy_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = dummy_pcm_hw_params, .hw_params = dummy_pcm_hw_params,
.hw_free = dummy_pcm_hw_free,
.prepare = dummy_pcm_prepare, .prepare = dummy_pcm_prepare,
.trigger = dummy_pcm_trigger, .trigger = dummy_pcm_trigger,
.pointer = dummy_pcm_pointer, .pointer = dummy_pcm_pointer,
@@ -700,7 +690,7 @@ static int snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
pcm->info_flags = 0; pcm->info_flags = 0;
strcpy(pcm->name, "Dummy PCM"); strcpy(pcm->name, "Dummy PCM");
if (!fake_buffer) { if (!fake_buffer) {
snd_pcm_lib_preallocate_pages_for_all(pcm, snd_pcm_set_managed_buffer_all(pcm,
SNDRV_DMA_TYPE_CONTINUOUS, SNDRV_DMA_TYPE_CONTINUOUS,
NULL, NULL,
0, 64*1024); 0, 64*1024);