p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: pdaudiocf: Use managed buffer allocation 

Clean up the driver with the new managed buffer allocation API.
The hw_params and hw_free callbacks became superfluous and got
dropped.

Link: https://lore.kernel.org/r/20191209094943.14984-58-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-12-09 10:49:29 +01:00
parent b6ed90c0dd
commit 6dfa8fd598
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
View File

@ -83,23 +83,6 @@ static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
return ret; return ret;
} }
/*
* pdacf_pcm_hw_params - hw_params callback for playback and capture
*/
static int pdacf_pcm_hw_params(struct snd_pcm_substream *subs,
struct snd_pcm_hw_params *hw_params)
{
return snd_pcm_lib_malloc_pages(subs, params_buffer_bytes(hw_params));
}
/*
* pdacf_pcm_hw_free - hw_free callback for playback and capture
*/
static int pdacf_pcm_hw_free(struct snd_pcm_substream *subs)
{
return snd_pcm_lib_free_pages(subs);
}
/* /*
* pdacf_pcm_prepare - prepare callback for playback and capture * pdacf_pcm_prepare - prepare callback for playback and capture
*/ */
@ -256,8 +239,6 @@ static const struct snd_pcm_ops pdacf_pcm_capture_ops = {
.open = pdacf_pcm_capture_open, .open = pdacf_pcm_capture_open,
.close = pdacf_pcm_capture_close, .close = pdacf_pcm_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = pdacf_pcm_hw_params,
.hw_free = pdacf_pcm_hw_free,
.prepare = pdacf_pcm_prepare, .prepare = pdacf_pcm_prepare,
.trigger = pdacf_pcm_trigger, .trigger = pdacf_pcm_trigger,
.pointer = pdacf_pcm_capture_pointer, .pointer = pdacf_pcm_capture_pointer,
@ -277,9 +258,9 @@ int snd_pdacf_pcm_new(struct snd_pdacf *chip)
return err; return err;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pdacf_pcm_capture_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pdacf_pcm_capture_ops);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC, snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,
snd_dma_continuous_data(GFP_KERNEL | GFP_DMA32), snd_dma_continuous_data(GFP_KERNEL | GFP_DMA32),
0, 0); 0, 0);
pcm->private_data = chip; pcm->private_data = chip;
pcm->info_flags = 0; pcm->info_flags = 0;