media: ivtv: Clean up ALSA PCM API usages

With the recent  change in ALSA PCM core, the whole open-coded vmalloc
buffer handling in this driver can be dropped by replacing with the
managed buffer allocation.

Cc: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
index 9e6019a159f4c5e47b39e91d9cadf1de7562f7b1..cb281ce089f937dc3d1fd1fe48fcfd4b1667461b 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
@@ -16,8 +16,6 @@
 #include "ivtv-alsa.h"
 #include "ivtv-alsa-pcm.h"
 
-#include <linux/vmalloc.h>
-
 #include <sound/core.h>
 #include <sound/pcm.h>
 
@@ -218,55 +216,6 @@ static int snd_ivtv_pcm_ioctl(struct snd_pcm_substream *substream,
        return ret;
 }
 
-
-static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
-                                       size_t size)
-{
-       struct snd_pcm_runtime *runtime = subs->runtime;
-
-       dprintk("Allocating vbuffer\n");
-       if (runtime->dma_area) {
-               if (runtime->dma_bytes > size)
-                       return 0;
-
-               vfree(runtime->dma_area);
-       }
-       runtime->dma_area = vmalloc(size);
-       if (!runtime->dma_area)
-               return -ENOMEM;
-
-       runtime->dma_bytes = size;
-
-       return 0;
-}
-
-static int snd_ivtv_pcm_hw_params(struct snd_pcm_substream *substream,
-                        struct snd_pcm_hw_params *params)
-{
-       dprintk("%s called\n", __func__);
-
-       return snd_pcm_alloc_vmalloc_buffer(substream,
-                                          params_buffer_bytes(params));
-}
-
-static int snd_ivtv_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-       struct snd_ivtv_card *itvsc = snd_pcm_substream_chip(substream);
-       unsigned long flags;
-       unsigned char *dma_area = NULL;
-
-       spin_lock_irqsave(&itvsc->slock, flags);
-       if (substream->runtime->dma_area) {
-               dprintk("freeing pcm capture region\n");
-               dma_area = substream->runtime->dma_area;
-               substream->runtime->dma_area = NULL;
-       }
-       spin_unlock_irqrestore(&itvsc->slock, flags);
-       vfree(dma_area);
-
-       return 0;
-}
-
 static int snd_ivtv_pcm_prepare(struct snd_pcm_substream *substream)
 {
        struct snd_ivtv_card *itvsc = snd_pcm_substream_chip(substream);
@@ -296,24 +245,13 @@ snd_pcm_uframes_t snd_ivtv_pcm_pointer(struct snd_pcm_substream *substream)
        return hwptr_done;
 }
 
-static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
-                                            unsigned long offset)
-{
-       void *pageptr = subs->runtime->dma_area + offset;
-
-       return vmalloc_to_page(pageptr);
-}
-
 static const struct snd_pcm_ops snd_ivtv_pcm_capture_ops = {
        .open           = snd_ivtv_pcm_capture_open,
        .close          = snd_ivtv_pcm_capture_close,
        .ioctl          = snd_ivtv_pcm_ioctl,
-       .hw_params      = snd_ivtv_pcm_hw_params,
-       .hw_free        = snd_ivtv_pcm_hw_free,
        .prepare        = snd_ivtv_pcm_prepare,
        .trigger        = snd_ivtv_pcm_trigger,
        .pointer        = snd_ivtv_pcm_pointer,
-       .page           = snd_pcm_get_vmalloc_page,
 };
 
 int snd_ivtv_pcm_create(struct snd_ivtv_card *itvsc)
@@ -339,6 +277,7 @@ int snd_ivtv_pcm_create(struct snd_ivtv_card *itvsc)
 
        snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE,
                        &snd_ivtv_pcm_capture_ops);
+       snd_pcm_set_managed_buffer_all(sp, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);
        sp->info_flags = 0;
        sp->private_data = itvsc;
        strscpy(sp->name, itv->card_name, sizeof(sp->name));