Commit 8f326303 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: vx: 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-9-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d635f09e
...@@ -772,23 +772,6 @@ static snd_pcm_uframes_t vx_pcm_playback_pointer(struct snd_pcm_substream *subs) ...@@ -772,23 +772,6 @@ static snd_pcm_uframes_t vx_pcm_playback_pointer(struct snd_pcm_substream *subs)
return pipe->position; return pipe->position;
} }
/*
* vx_pcm_hw_params - hw_params callback for playback and capture
*/
static int vx_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));
}
/*
* vx_pcm_hw_free - hw_free callback for playback and capture
*/
static int vx_pcm_hw_free(struct snd_pcm_substream *subs)
{
return snd_pcm_lib_free_pages(subs);
}
/* /*
* vx_pcm_prepare - prepare callback for playback and capture * vx_pcm_prepare - prepare callback for playback and capture
*/ */
...@@ -861,8 +844,6 @@ static const struct snd_pcm_ops vx_pcm_playback_ops = { ...@@ -861,8 +844,6 @@ static const struct snd_pcm_ops vx_pcm_playback_ops = {
.open = vx_pcm_playback_open, .open = vx_pcm_playback_open,
.close = vx_pcm_playback_close, .close = vx_pcm_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = vx_pcm_hw_params,
.hw_free = vx_pcm_hw_free,
.prepare = vx_pcm_prepare, .prepare = vx_pcm_prepare,
.trigger = vx_pcm_trigger, .trigger = vx_pcm_trigger,
.pointer = vx_pcm_playback_pointer, .pointer = vx_pcm_playback_pointer,
...@@ -1081,8 +1062,6 @@ static const struct snd_pcm_ops vx_pcm_capture_ops = { ...@@ -1081,8 +1062,6 @@ static const struct snd_pcm_ops vx_pcm_capture_ops = {
.open = vx_pcm_capture_open, .open = vx_pcm_capture_open,
.close = vx_pcm_capture_close, .close = vx_pcm_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = vx_pcm_hw_params,
.hw_free = vx_pcm_hw_free,
.prepare = vx_pcm_prepare, .prepare = vx_pcm_prepare,
.trigger = vx_pcm_trigger, .trigger = vx_pcm_trigger,
.pointer = vx_pcm_capture_pointer, .pointer = vx_pcm_capture_pointer,
...@@ -1230,9 +1209,9 @@ int snd_vx_pcm_new(struct vx_core *chip) ...@@ -1230,9 +1209,9 @@ int snd_vx_pcm_new(struct vx_core *chip)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &vx_pcm_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &vx_pcm_playback_ops);
if (ins) if (ins)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &vx_pcm_capture_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &vx_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->private_free = snd_vx_pcm_free; pcm->private_free = snd_vx_pcm_free;
......
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