media: videobuf2: Rename offset parameter

Rename 'off' parameter to 'offset' to clarify the code.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 27aee92f3eea40e649ca9d32ef0dfd376e2c1d60..e5fd7ff0dae6cfeaffc4060de11d848cd2a2b784 100644 (file)
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -356,23 +356,23 @@ static void __setup_offsets(struct vb2_buffer *vb)
 {
        struct vb2_queue *q = vb->vb2_queue;
        unsigned int plane;
-       unsigned long off = 0;
+       unsigned long offset = 0;
 
        if (vb->index) {
                struct vb2_buffer *prev = q->bufs[vb->index - 1];
                struct vb2_plane *p = &prev->planes[prev->num_planes - 1];
 
-               off = PAGE_ALIGN(p->m.offset + p->length);
+               offset = PAGE_ALIGN(p->m.offset + p->length);
        }
 
        for (plane = 0; plane < vb->num_planes; ++plane) {
-               vb->planes[plane].m.offset = off;
+               vb->planes[plane].m.offset = offset;
 
                dprintk(q, 3, "buffer %d, plane %d offset 0x%08lx\n",
-                               vb->index, plane, off);
+                               vb->index, plane, offset);
 
-               off += vb->planes[plane].length;
-               off = PAGE_ALIGN(off);
+               offset += vb->planes[plane].length;
+               offset = PAGE_ALIGN(offset);
        }
 }
 
@@ -2185,10 +2185,10 @@ int vb2_core_streamoff(struct vb2_queue *q, unsigned int type)
 EXPORT_SYMBOL_GPL(vb2_core_streamoff);
 
 /*
- * __find_plane_by_offset() - find plane associated with the given offset off
+ * __find_plane_by_offset() - find plane associated with the given offset
  */
-static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off,
-                       unsigned int *_buffer, unsigned int *_plane)
+static int __find_plane_by_offset(struct vb2_queue *q, unsigned long offset,
+                                 unsigned int *_buffer, unsigned int *_plane)
 {
        struct vb2_buffer *vb;
        unsigned int buffer, plane;
@@ -2218,7 +2218,7 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off,
                vb = q->bufs[buffer];
 
                for (plane = 0; plane < vb->num_planes; ++plane) {
-                       if (vb->planes[plane].m.offset == off) {
+                       if (vb->planes[plane].m.offset == offset) {
                                *_buffer = buffer;
                                *_plane = plane;
                                return 0;
@@ -2304,7 +2304,7 @@ EXPORT_SYMBOL_GPL(vb2_core_expbuf);
 
 int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
 {
-       unsigned long off = vma->vm_pgoff << PAGE_SHIFT;
+       unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
        struct vb2_buffer *vb;
        unsigned int buffer = 0, plane = 0;
        int ret;
@@ -2335,7 +2335,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
         * Find the plane corresponding to the offset passed by userspace. This
         * will return an error if not MEMORY_MMAP or file I/O is in progress.
         */
-       ret = __find_plane_by_offset(q, off, &buffer, &plane);
+       ret = __find_plane_by_offset(q, offset, &buffer, &plane);
        if (ret)
                goto unlock;
 
@@ -2380,7 +2380,7 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
                                    unsigned long pgoff,
                                    unsigned long flags)
 {
-       unsigned long off = pgoff << PAGE_SHIFT;
+       unsigned long offset = pgoff << PAGE_SHIFT;
        struct vb2_buffer *vb;
        unsigned int buffer, plane;
        void *vaddr;
@@ -2392,7 +2392,7 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
         * Find the plane corresponding to the offset passed by userspace. This
         * will return an error if not MEMORY_MMAP or file I/O is in progress.
         */
-       ret = __find_plane_by_offset(q, off, &buffer, &plane);
+       ret = __find_plane_by_offset(q, offset, &buffer, &plane);
        if (ret)
                goto unlock;