Commit 6dfa8fd5 authored by Takashi Iwai's avatar Takashi Iwai

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.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b6ed90c0
...@@ -83,23 +83,6 @@ static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd) ...@@ -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 = { ...@@ -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,7 +258,7 @@ int snd_pdacf_pcm_new(struct snd_pdacf *chip) ...@@ -277,7 +258,7 @@ 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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment