Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...

1 files changed, 17 insertions, 19 deletions

diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index 583728f4c221..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;
@@ -135,7 +135,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
         struct videobuf_dma_sg_memory
  */
 
-static struct videobuf_buffer *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
 {
         struct videobuf_vmalloc_memory *mem;
         struct videobuf_buffer *vb;
@@ -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;
@@ -245,8 +245,6 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
                 return -ENOMEM;
 
         buf->map = map;
-        map->start = vma->vm_start;
-        map->end   = vma->vm_end;
         map->q     = q;
 
         buf->baddr = vma->vm_start;
@@ -256,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;
         }
 
@@ -293,7 +291,7 @@ error:
 static struct videobuf_qtype_ops qops = {
         .magic        = MAGIC_QTYPE_OPS,
 
-        .alloc        = __videobuf_alloc,
+        .alloc_vb     = __videobuf_alloc_vb,
         .iolock       = __videobuf_iolock,
         .mmap_mapper  = __videobuf_mmap_mapper,
         .vaddr        = videobuf_to_vmalloc,
@@ -319,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);
 
@@ -341,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;
 }