Merge branch 'asoc-5.6' into asoc-next

[linux.git] / sound / soc / soc-generic-dmaengine-pcm.c

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 2b5f3b1b062bca761f3116afd6df32c5cc2764ab..2cc25651661caa8634eff0c6ab1f247df44e6c3b 100644 (file)
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -104,7 +104,7 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component,
                        return ret;
        }
 
-       return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+       return 0;
 }
 
 static int
@@ -170,12 +170,6 @@ static int dmaengine_pcm_close(struct snd_soc_component *component,
        return snd_dmaengine_pcm_close(substream);
 }
 
-static int dmaengine_pcm_hw_free(struct snd_soc_component *component,
-                                struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
 static int dmaengine_pcm_trigger(struct snd_soc_component *component,
                                 struct snd_pcm_substream *substream, int cmd)
 {
@@ -263,7 +257,7 @@ static int dmaengine_pcm_new(struct snd_soc_component *component,
                        return -EINVAL;
                }
 
-               snd_pcm_lib_preallocate_pages(substream,
+               snd_pcm_set_managed_buffer(substream,
                                SNDRV_DMA_TYPE_DEV_IRAM,
                                dmaengine_dma_dev(pcm, substream),
                                prealloc_buffer_size,
@@ -331,9 +325,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component = {
        .probe_order    = SND_SOC_COMP_ORDER_LATE,
        .open           = dmaengine_pcm_open,
        .close          = dmaengine_pcm_close,
-       .ioctl          = snd_soc_pcm_lib_ioctl,
        .hw_params      = dmaengine_pcm_hw_params,
-       .hw_free        = dmaengine_pcm_hw_free,
        .trigger        = dmaengine_pcm_trigger,
        .pointer        = dmaengine_pcm_pointer,
        .pcm_construct  = dmaengine_pcm_new,
@@ -344,9 +336,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component_process = {
        .probe_order    = SND_SOC_COMP_ORDER_LATE,
        .open           = dmaengine_pcm_open,
        .close          = dmaengine_pcm_close,
-       .ioctl          = snd_soc_pcm_lib_ioctl,
        .hw_params      = dmaengine_pcm_hw_params,
-       .hw_free        = dmaengine_pcm_hw_free,
        .trigger        = dmaengine_pcm_trigger,
        .pointer        = dmaengine_pcm_pointer,
        .copy_user      = dmaengine_copy_user,