public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: echoaudio: Use managed buffer allocation

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

Link: https://lore.kernel.org/r/20191209094943.14984-35-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-12-09 10:49:06 +01:00
parent 76178cc7d5
commit 11f63ca399
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sound/pci/echoaudio/echoaudio.c
View file

@ -547,16 +547,6 @@ static int init_engine(struct snd_pcm_substream *substream,
"pcm_hw_params (bufsize=%dB periods=%d persize=%dB)\n", "pcm_hw_params (bufsize=%dB periods=%d persize=%dB)\n",
params_buffer_bytes(hw_params), params_periods(hw_params), params_buffer_bytes(hw_params), params_periods(hw_params),
params_period_bytes(hw_params)); params_period_bytes(hw_params));
err = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params));
if (err < 0) {
dev_err(chip->card->dev, "malloc_pages err=%d\n", err);
spin_lock_irq(&chip->lock);
free_pipes(chip, pipe);
spin_unlock_irq(&chip->lock);
pipe->index = -1;
return err;
}
sglist_init(chip, pipe); sglist_init(chip, pipe);
edge = PAGE_SIZE; edge = PAGE_SIZE;
@ -671,7 +661,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
} }
spin_unlock_irq(&chip->lock); spin_unlock_irq(&chip->lock);
snd_pcm_lib_free_pages(substream);
return 0; return 0;
} }
@ -872,10 +861,10 @@ static void snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)
for (stream = 0; stream < 2; stream++) for (stream = 0; stream < 2; stream++)
for (ss = pcm->streams[stream].substream; ss; ss = ss->next) for (ss = pcm->streams[stream].substream; ss; ss = ss->next)
snd_pcm_lib_preallocate_pages(ss, SNDRV_DMA_TYPE_DEV_SG, snd_pcm_set_managed_buffer(ss, SNDRV_DMA_TYPE_DEV_SG,
dev, dev,
ss->number ? 0 : 128<<10, ss->number ? 0 : 128<<10,
256<<10); 256<<10);
} }