diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-06-14 09:37:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-25 14:11:35 -0500 |
commit | f7f129ce2e33f9bd444c1889216ab92f2ec69d91 (patch) | |
tree | 695a4d87c09ff2155e39f2414c0accfe85cfda28 | |
parent | 3c3016ba9e59e374a44d2422082f584adde96b08 (diff) |
[media] v4l: vb2-dma-contig: shorten vb2_dma_contig prefix to vb2_dc
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/v4l2-core/videobuf2-dma-contig.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c index 4b7132660a93..a05784ffe271 100644 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c | |||
@@ -32,9 +32,9 @@ struct vb2_dc_buf { | |||
32 | struct vb2_vmarea_handler handler; | 32 | struct vb2_vmarea_handler handler; |
33 | }; | 33 | }; |
34 | 34 | ||
35 | static void vb2_dma_contig_put(void *buf_priv); | 35 | static void vb2_dc_put(void *buf_priv); |
36 | 36 | ||
37 | static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size) | 37 | static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) |
38 | { | 38 | { |
39 | struct vb2_dc_conf *conf = alloc_ctx; | 39 | struct vb2_dc_conf *conf = alloc_ctx; |
40 | struct vb2_dc_buf *buf; | 40 | struct vb2_dc_buf *buf; |
@@ -56,7 +56,7 @@ static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size) | |||
56 | buf->size = size; | 56 | buf->size = size; |
57 | 57 | ||
58 | buf->handler.refcount = &buf->refcount; | 58 | buf->handler.refcount = &buf->refcount; |
59 | buf->handler.put = vb2_dma_contig_put; | 59 | buf->handler.put = vb2_dc_put; |
60 | buf->handler.arg = buf; | 60 | buf->handler.arg = buf; |
61 | 61 | ||
62 | atomic_inc(&buf->refcount); | 62 | atomic_inc(&buf->refcount); |
@@ -64,7 +64,7 @@ static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size) | |||
64 | return buf; | 64 | return buf; |
65 | } | 65 | } |
66 | 66 | ||
67 | static void vb2_dma_contig_put(void *buf_priv) | 67 | static void vb2_dc_put(void *buf_priv) |
68 | { | 68 | { |
69 | struct vb2_dc_buf *buf = buf_priv; | 69 | struct vb2_dc_buf *buf = buf_priv; |
70 | 70 | ||
@@ -75,14 +75,14 @@ static void vb2_dma_contig_put(void *buf_priv) | |||
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
78 | static void *vb2_dma_contig_cookie(void *buf_priv) | 78 | static void *vb2_dc_cookie(void *buf_priv) |
79 | { | 79 | { |
80 | struct vb2_dc_buf *buf = buf_priv; | 80 | struct vb2_dc_buf *buf = buf_priv; |
81 | 81 | ||
82 | return &buf->dma_addr; | 82 | return &buf->dma_addr; |
83 | } | 83 | } |
84 | 84 | ||
85 | static void *vb2_dma_contig_vaddr(void *buf_priv) | 85 | static void *vb2_dc_vaddr(void *buf_priv) |
86 | { | 86 | { |
87 | struct vb2_dc_buf *buf = buf_priv; | 87 | struct vb2_dc_buf *buf = buf_priv; |
88 | if (!buf) | 88 | if (!buf) |
@@ -91,14 +91,14 @@ static void *vb2_dma_contig_vaddr(void *buf_priv) | |||
91 | return buf->vaddr; | 91 | return buf->vaddr; |
92 | } | 92 | } |
93 | 93 | ||
94 | static unsigned int vb2_dma_contig_num_users(void *buf_priv) | 94 | static unsigned int vb2_dc_num_users(void *buf_priv) |
95 | { | 95 | { |
96 | struct vb2_dc_buf *buf = buf_priv; | 96 | struct vb2_dc_buf *buf = buf_priv; |
97 | 97 | ||
98 | return atomic_read(&buf->refcount); | 98 | return atomic_read(&buf->refcount); |
99 | } | 99 | } |
100 | 100 | ||
101 | static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma) | 101 | static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) |
102 | { | 102 | { |
103 | struct vb2_dc_buf *buf = buf_priv; | 103 | struct vb2_dc_buf *buf = buf_priv; |
104 | 104 | ||
@@ -111,7 +111,7 @@ static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma) | |||
111 | &vb2_common_vm_ops, &buf->handler); | 111 | &vb2_common_vm_ops, &buf->handler); |
112 | } | 112 | } |
113 | 113 | ||
114 | static void *vb2_dma_contig_get_userptr(void *alloc_ctx, unsigned long vaddr, | 114 | static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, |
115 | unsigned long size, int write) | 115 | unsigned long size, int write) |
116 | { | 116 | { |
117 | struct vb2_dc_buf *buf; | 117 | struct vb2_dc_buf *buf; |
@@ -138,7 +138,7 @@ static void *vb2_dma_contig_get_userptr(void *alloc_ctx, unsigned long vaddr, | |||
138 | return buf; | 138 | return buf; |
139 | } | 139 | } |
140 | 140 | ||
141 | static void vb2_dma_contig_put_userptr(void *mem_priv) | 141 | static void vb2_dc_put_userptr(void *mem_priv) |
142 | { | 142 | { |
143 | struct vb2_dc_buf *buf = mem_priv; | 143 | struct vb2_dc_buf *buf = mem_priv; |
144 | 144 | ||
@@ -150,14 +150,14 @@ static void vb2_dma_contig_put_userptr(void *mem_priv) | |||
150 | } | 150 | } |
151 | 151 | ||
152 | const struct vb2_mem_ops vb2_dma_contig_memops = { | 152 | const struct vb2_mem_ops vb2_dma_contig_memops = { |
153 | .alloc = vb2_dma_contig_alloc, | 153 | .alloc = vb2_dc_alloc, |
154 | .put = vb2_dma_contig_put, | 154 | .put = vb2_dc_put, |
155 | .cookie = vb2_dma_contig_cookie, | 155 | .cookie = vb2_dc_cookie, |
156 | .vaddr = vb2_dma_contig_vaddr, | 156 | .vaddr = vb2_dc_vaddr, |
157 | .mmap = vb2_dma_contig_mmap, | 157 | .mmap = vb2_dc_mmap, |
158 | .get_userptr = vb2_dma_contig_get_userptr, | 158 | .get_userptr = vb2_dc_get_userptr, |
159 | .put_userptr = vb2_dma_contig_put_userptr, | 159 | .put_userptr = vb2_dc_put_userptr, |
160 | .num_users = vb2_dma_contig_num_users, | 160 | .num_users = vb2_dc_num_users, |
161 | }; | 161 | }; |
162 | EXPORT_SYMBOL_GPL(vb2_dma_contig_memops); | 162 | EXPORT_SYMBOL_GPL(vb2_dma_contig_memops); |
163 | 163 | ||