V4L/DVB: videobuf: Rename vmalloc fields to vaddr

The videobuf_dmabuf and videobuf_vmalloc_memory fields have a vmalloc
field to store the kernel virtual address of vmalloc'ed buffers. Rename
the field to vaddr.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

7 files changed, 29 insertions, 29 deletions

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index ba499d04de4d..9209d5b87e04 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -426,7 +426,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         chip->buf = buf;
         chip->dma_risc = dma;
 
-        substream->runtime->dma_area = chip->dma_risc->vmalloc;
+        substream->runtime->dma_area = chip->dma_risc->vaddr;
         substream->runtime->dma_bytes = chip->dma_size;
         substream->runtime->dma_addr = 0;
         return 0;
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 5bca2abb31e6..68b7e8d10ded 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -669,7 +669,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
            byte, but it doesn't work. So I allocate the DMA using the
            V4L functions, and force ALSA to use that as the DMA area */
 
-        substream->runtime->dma_area = dev->dmasound.dma.vmalloc;
+        substream->runtime->dma_area = dev->dmasound.dma.vaddr;
         substream->runtime->dma_bytes = dev->dmasound.bufsize;
         substream->runtime->dma_addr = 0;
 
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 2d64040594b8..06f9a9c2a39a 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -211,17 +211,17 @@ int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction,
         dprintk(1, "init kernel [%d pages]\n", nr_pages);
 
         dma->direction = direction;
-        dma->vmalloc = vmalloc_32(nr_pages << PAGE_SHIFT);
-        if (NULL == dma->vmalloc) {
+        dma->vaddr = vmalloc_32(nr_pages << PAGE_SHIFT);
+        if (NULL == dma->vaddr) {
                 dprintk(1, "vmalloc_32(%d pages) failed\n", nr_pages);
                 return -ENOMEM;
         }
 
         dprintk(1, "vmalloc is at addr 0x%08lx, size=%d\n",
-                                (unsigned long)dma->vmalloc,
+                                (unsigned long)dma->vaddr,
                                 nr_pages << PAGE_SHIFT);
 
-        memset(dma->vmalloc, 0, nr_pages << PAGE_SHIFT);
+        memset(dma->vaddr, 0, nr_pages << PAGE_SHIFT);
         dma->nr_pages = nr_pages;
 
         return 0;
@@ -254,8 +254,8 @@ int videobuf_dma_map(struct device *dev, struct videobuf_dmabuf *dma)
                 dma->sglist = videobuf_pages_to_sg(dma->pages, dma->nr_pages,
                                                    dma->offset);
         }
-        if (dma->vmalloc) {
-                dma->sglist = videobuf_vmalloc_to_sg(dma->vmalloc,
+        if (dma->vaddr) {
+                dma->sglist = videobuf_vmalloc_to_sg(dma->vaddr,
                                                      dma->nr_pages);
         }
         if (dma->bus_addr) {
@@ -319,8 +319,8 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
                 dma->pages = NULL;
         }
 
-        vfree(dma->vmalloc);
-        dma->vmalloc = NULL;
+        vfree(dma->vaddr);
+        dma->vaddr = NULL;
 
         if (dma->bus_addr)
                 dma->bus_addr = 0;
@@ -444,7 +444,7 @@ static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
 
         MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
 
-        return mem->dma.vmalloc;
+        return mem->dma.vaddr;
 }
 
 static int __videobuf_iolock(struct videobuf_queue *q,
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index f0d7cb8d4c72..e7fe31d54f07 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -102,10 +102,10 @@ static void videobuf_vm_close(struct vm_area_struct *vma)
                                    called with IRQ's disabled
                                  */
                                 dprintk(1, "%s: buf[%d] freeing (%p)\n",
-                                        __func__, i, mem->vmalloc);
+                                        __func__, i, mem->vaddr);
 
-                                vfree(mem->vmalloc);
-                                mem->vmalloc = NULL;
+                                vfree(mem->vaddr);
+                                mem->vaddr = NULL;
                         }
 
                         q->bufs[i]->map   = NULL;
@@ -170,7 +170,7 @@ static int __videobuf_iolock(struct videobuf_queue *q,
                 dprintk(1, "%s memory method MMAP\n", __func__);
 
                 /* All handling should be done by __videobuf_mmap_mapper() */
-                if (!mem->vmalloc) {
+                if (!mem->vaddr) {
                         printk(KERN_ERR "memory is not alloced/mmapped.\n");
                         return -EINVAL;
                 }
@@ -189,13 +189,13 @@ static int __videobuf_iolock(struct videobuf_queue *q,
                  * read() method.
                  */
 
-                mem->vmalloc = vmalloc_user(pages);
-                if (!mem->vmalloc) {
+                mem->vaddr = vmalloc_user(pages);
+                if (!mem->vaddr) {
                         printk(KERN_ERR "vmalloc (%d pages) failed\n", pages);
                         return -ENOMEM;
                 }
                 dprintk(1, "vmalloc is at addr %p (%d pages)\n",
-                        mem->vmalloc, pages);
+                        mem->vaddr, pages);
 
 #if 0
                 int rc;
@@ -254,18 +254,18 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
         MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
 
         pages = PAGE_ALIGN(vma->vm_end - vma->vm_start);
-        mem->vmalloc = vmalloc_user(pages);
-        if (!mem->vmalloc) {
+        mem->vaddr = vmalloc_user(pages);
+        if (!mem->vaddr) {
                 printk(KERN_ERR "vmalloc (%d pages) failed\n", pages);
                 goto error;
         }
-        dprintk(1, "vmalloc is at addr %p (%d pages)\n", mem->vmalloc, pages);
+        dprintk(1, "vmalloc is at addr %p (%d pages)\n", mem->vaddr, pages);
 
         /* Try to remap memory */
-        retval = remap_vmalloc_range(vma, mem->vmalloc, 0);
+        retval = remap_vmalloc_range(vma, mem->vaddr, 0);
         if (retval < 0) {
                 printk(KERN_ERR "mmap: remap failed with error %d. ", retval);
-                vfree(mem->vmalloc);
+                vfree(mem->vaddr);
                 goto error;
         }
 
@@ -317,7 +317,7 @@ void *videobuf_to_vmalloc(struct videobuf_buffer *buf)
         BUG_ON(!mem);
         MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
 
-        return mem->vmalloc;
+        return mem->vaddr;
 }
 EXPORT_SYMBOL_GPL(videobuf_to_vmalloc);
 
@@ -339,8 +339,8 @@ void videobuf_vmalloc_free(struct videobuf_buffer *buf)
 
         MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
 
-        vfree(mem->vmalloc);
-        mem->vmalloc = NULL;
+        vfree(mem->vaddr);
+        mem->vaddr = NULL;
 
         return;
 }
diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
index 0771a6a313ad..a43b18816fa5 100644
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/staging/cx25821/cx25821-alsa.c
@@ -492,7 +492,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
         chip->buf = buf;
         chip->dma_risc = dma;
 
-        substream->runtime->dma_area = chip->dma_risc->vmalloc;
+        substream->runtime->dma_area = chip->dma_risc->vaddr;
         substream->runtime->dma_bytes = chip->dma_size;
         substream->runtime->dma_addr = 0;
 
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index 913860e9c845..97e07f46a0fa 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -51,7 +51,7 @@ struct videobuf_dmabuf {
         struct page         **pages;
 
         /* for kernel buffers */
-        void                *vmalloc;
+        void                *vaddr;
 
         /* for overlay buffers (pci-pci dma) */
         dma_addr_t          bus_addr;
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index 851eb1a2ff2a..e19403c18dae 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -22,7 +22,7 @@
 struct videobuf_vmalloc_memory {
         u32                 magic;
 
-        void                *vmalloc;
+        void                *vaddr;
 
         /* remap_vmalloc_range seems to need to run
          * after mmap() on some cases */