Commit 005f3e67 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: parisc: Use managed buffer allocation

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

Link: https://lore.kernel.org/r/20191209094943.14984-19-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ee88f4eb
...@@ -567,20 +567,12 @@ static int ...@@ -567,20 +567,12 @@ static int
snd_harmony_hw_params(struct snd_pcm_substream *ss, snd_harmony_hw_params(struct snd_pcm_substream *ss,
struct snd_pcm_hw_params *hw) struct snd_pcm_hw_params *hw)
{ {
int err;
struct snd_harmony *h = snd_pcm_substream_chip(ss); struct snd_harmony *h = snd_pcm_substream_chip(ss);
err = snd_pcm_lib_malloc_pages(ss, params_buffer_bytes(hw)); if (h->dma.type == SNDRV_DMA_TYPE_CONTINUOUS)
if (err > 0 && h->dma.type == SNDRV_DMA_TYPE_CONTINUOUS)
ss->runtime->dma_addr = __pa(ss->runtime->dma_area); ss->runtime->dma_addr = __pa(ss->runtime->dma_area);
return err; return 0;
}
static int
snd_harmony_hw_free(struct snd_pcm_substream *ss)
{
return snd_pcm_lib_free_pages(ss);
} }
static const struct snd_pcm_ops snd_harmony_playback_ops = { static const struct snd_pcm_ops snd_harmony_playback_ops = {
...@@ -588,7 +580,6 @@ static const struct snd_pcm_ops snd_harmony_playback_ops = { ...@@ -588,7 +580,6 @@ static const struct snd_pcm_ops snd_harmony_playback_ops = {
.close = snd_harmony_playback_close, .close = snd_harmony_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_harmony_hw_params, .hw_params = snd_harmony_hw_params,
.hw_free = snd_harmony_hw_free,
.prepare = snd_harmony_playback_prepare, .prepare = snd_harmony_playback_prepare,
.trigger = snd_harmony_playback_trigger, .trigger = snd_harmony_playback_trigger,
.pointer = snd_harmony_playback_pointer, .pointer = snd_harmony_playback_pointer,
...@@ -599,7 +590,6 @@ static const struct snd_pcm_ops snd_harmony_capture_ops = { ...@@ -599,7 +590,6 @@ static const struct snd_pcm_ops snd_harmony_capture_ops = {
.close = snd_harmony_capture_close, .close = snd_harmony_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_harmony_hw_params, .hw_params = snd_harmony_hw_params,
.hw_free = snd_harmony_hw_free,
.prepare = snd_harmony_capture_prepare, .prepare = snd_harmony_capture_prepare,
.trigger = snd_harmony_capture_trigger, .trigger = snd_harmony_capture_trigger,
.pointer = snd_harmony_capture_pointer, .pointer = snd_harmony_capture_pointer,
...@@ -656,7 +646,7 @@ snd_harmony_pcm_init(struct snd_harmony *h) ...@@ -656,7 +646,7 @@ snd_harmony_pcm_init(struct snd_harmony *h)
} }
/* pre-allocate space for DMA */ /* pre-allocate space for DMA */
snd_pcm_lib_preallocate_pages_for_all(pcm, h->dma.type, h->dma.dev, snd_pcm_set_managed_buffer_all(pcm, h->dma.type, h->dma.dev,
MAX_BUF_SIZE, MAX_BUF_SIZE); MAX_BUF_SIZE, MAX_BUF_SIZE);
h->st.format = snd_harmony_set_data_format(h, h->st.format = snd_harmony_set_data_format(h,
......
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