V4L/DVB: v4l videobuf: rename .vmalloc to .vaddr

Rename the .vmalloc op in struct videobuf_qtype_ops to .vaddr. This op returns
the virtual kernel address of a buffer. vaddr is a lot less confusing than
vmalloc since this callback does do any allocations.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 7b69f6b00a3d5ec821c71a2eb324c8ecf2919aa8..26241a833894727e6625d052f9649ca30a0bd2bb 100644 (file)
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -108,8 +108,8 @@ EXPORT_SYMBOL_GPL(videobuf_iolock);
 void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,
                                struct videobuf_buffer *buf)
 {
-       if (q->int_ops->vmalloc)
-               return q->int_ops->vmalloc(buf);
+       if (q->int_ops->vaddr)
+               return q->int_ops->vaddr(buf);
        else
                return NULL;
 }

diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
index 76e158feca61ee55116e180bcb08d73e1b758fb8..7226ca47cbf514baf93fca7fb0f994e9bf78d645 100644 (file)
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -204,7 +204,7 @@ static struct videobuf_buffer *__videobuf_alloc(size_t size)
        return vb;
 }
 
-static void *__videobuf_to_vmalloc(struct videobuf_buffer *buf)
+static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
 {
        struct videobuf_dma_contig_memory *mem = buf->priv;
 
@@ -414,7 +414,7 @@ static struct videobuf_qtype_ops qops = {
        .mmap_mapper  = __videobuf_mmap_mapper,
        .video_copy_to_user = __videobuf_copy_to_user,
        .copy_stream  = __videobuf_copy_stream,
-       .vmalloc      = __videobuf_to_vmalloc,
+       .vaddr        = __videobuf_to_vaddr,
 };
 
 void videobuf_queue_dma_contig_init(struct videobuf_queue *q,

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 014eb63c096034dfc7c26d903de5dbc8dee9189b..43e78ee24a1099f829e7c4c0d5fe3f52d9661a80 100644 (file)
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -460,7 +460,7 @@ static struct videobuf_buffer *__videobuf_alloc(size_t size)
        return vb;
 }
 
-static void *__videobuf_to_vmalloc(struct videobuf_buffer *buf)
+static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
 {
        struct videobuf_dma_sg_memory *mem = buf->priv;
        BUG_ON(!mem);
@@ -700,7 +700,7 @@ static struct videobuf_qtype_ops sg_ops = {
        .mmap_mapper  = __videobuf_mmap_mapper,
        .video_copy_to_user = __videobuf_copy_to_user,
        .copy_stream  = __videobuf_copy_stream,
-       .vmalloc      = __videobuf_to_vmalloc,
+       .vaddr        = __videobuf_to_vaddr,
 };
 
 void *videobuf_sg_alloc(size_t size)

diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index 000a60fc456ee0adff8bf471c831764102f67dfa..6db412abeacdbc3d3092ae3034fc27efd34be8d7 100644 (file)
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -373,7 +373,7 @@ static struct videobuf_qtype_ops qops = {
        .mmap_mapper  = __videobuf_mmap_mapper,
        .video_copy_to_user = __videobuf_copy_to_user,
        .copy_stream  = __videobuf_copy_stream,
-       .vmalloc      = videobuf_to_vmalloc,
+       .vaddr        = videobuf_to_vmalloc,
 };
 
 void videobuf_queue_vmalloc_init(struct videobuf_queue *q,

diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 4497e23c9d291aebba44ce997f0af235db636164..8fe3254ed952a620095e52277a6cf18176884a7b 100644 (file)
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -128,7 +128,7 @@ struct videobuf_qtype_ops {
        u32                     magic;
 
        struct videobuf_buffer *(*alloc)(size_t size);
-       void *(*vmalloc)        (struct videobuf_buffer *buf);
+       void *(*vaddr)          (struct videobuf_buffer *buf);
        int (*iolock)           (struct videobuf_queue *q,
                                 struct videobuf_buffer *vb,
                                 struct v4l2_framebuffer *fbuf);