aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/function/uvc_v4l2.c
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2014-09-08 19:02:08 -0400
committerFelipe Balbi <balbi@ti.com>2014-09-09 10:49:03 -0400
commit7ea95b110811fa8e41f5960c278bcfc80b8b21c1 (patch)
tree7d3ac41dd7a19baba014ea06a9afabb903bbcf80 /drivers/usb/gadget/function/uvc_v4l2.c
parent70aacc5777d1f1ca0a88067c9121ce86441bc4e0 (diff)
usb: gadget: uvc: rename functions to avoid conflicts with host uvc
Prepare for separate compilation of uvc function's components. Some symbols will have to be exported, so rename to avoid conflicts with functions of the same name in host uvc. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Tested-by: Michael Grzeschik <m.grzeschik@pengutronix.de> [Rename uvc_video_pump and uvc_queue_head as well] [Rename forgotten uvc_queue_cancel instance in a comment] Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/uvc_v4l2.c')
-rw-r--r--drivers/usb/gadget/function/uvc_v4l2.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 14c3a3734b95..c85730eb36dd 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -149,7 +149,7 @@ uvc_v4l2_reqbufs(struct file *file, void *fh, struct v4l2_requestbuffers *b)
149 if (b->type != video->queue.queue.type) 149 if (b->type != video->queue.queue.type)
150 return -EINVAL; 150 return -EINVAL;
151 151
152 return uvc_alloc_buffers(&video->queue, b); 152 return uvcg_alloc_buffers(&video->queue, b);
153} 153}
154 154
155static int 155static int
@@ -159,7 +159,7 @@ uvc_v4l2_querybuf(struct file *file, void *fh, struct v4l2_buffer *b)
159 struct uvc_device *uvc = video_get_drvdata(vdev); 159 struct uvc_device *uvc = video_get_drvdata(vdev);
160 struct uvc_video *video = &uvc->video; 160 struct uvc_video *video = &uvc->video;
161 161
162 return uvc_query_buffer(&video->queue, b); 162 return uvcg_query_buffer(&video->queue, b);
163} 163}
164 164
165static int 165static int
@@ -170,11 +170,11 @@ uvc_v4l2_qbuf(struct file *file, void *fh, struct v4l2_buffer *b)
170 struct uvc_video *video = &uvc->video; 170 struct uvc_video *video = &uvc->video;
171 int ret; 171 int ret;
172 172
173 ret = uvc_queue_buffer(&video->queue, b); 173 ret = uvcg_queue_buffer(&video->queue, b);
174 if (ret < 0) 174 if (ret < 0)
175 return ret; 175 return ret;
176 176
177 return uvc_video_pump(video); 177 return uvcg_video_pump(video);
178} 178}
179 179
180static int 180static int
@@ -184,7 +184,7 @@ uvc_v4l2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b)
184 struct uvc_device *uvc = video_get_drvdata(vdev); 184 struct uvc_device *uvc = video_get_drvdata(vdev);
185 struct uvc_video *video = &uvc->video; 185 struct uvc_video *video = &uvc->video;
186 186
187 return uvc_dequeue_buffer(&video->queue, b, file->f_flags & O_NONBLOCK); 187 return uvcg_dequeue_buffer(&video->queue, b, file->f_flags & O_NONBLOCK);
188} 188}
189 189
190static int 190static int
@@ -199,7 +199,7 @@ uvc_v4l2_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
199 return -EINVAL; 199 return -EINVAL;
200 200
201 /* Enable UVC video. */ 201 /* Enable UVC video. */
202 ret = uvc_video_enable(video, 1); 202 ret = uvcg_video_enable(video, 1);
203 if (ret < 0) 203 if (ret < 0)
204 return ret; 204 return ret;
205 205
@@ -223,7 +223,7 @@ uvc_v4l2_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
223 if (type != video->queue.queue.type) 223 if (type != video->queue.queue.type)
224 return -EINVAL; 224 return -EINVAL;
225 225
226 return uvc_video_enable(video, 0); 226 return uvcg_video_enable(video, 0);
227} 227}
228 228
229static int 229static int
@@ -309,8 +309,8 @@ uvc_v4l2_release(struct file *file)
309 309
310 uvc_function_disconnect(uvc); 310 uvc_function_disconnect(uvc);
311 311
312 uvc_video_enable(video, 0); 312 uvcg_video_enable(video, 0);
313 uvc_free_buffers(&video->queue); 313 uvcg_free_buffers(&video->queue);
314 314
315 file->private_data = NULL; 315 file->private_data = NULL;
316 v4l2_fh_del(&handle->vfh); 316 v4l2_fh_del(&handle->vfh);
@@ -326,7 +326,7 @@ uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
326 struct video_device *vdev = video_devdata(file); 326 struct video_device *vdev = video_devdata(file);
327 struct uvc_device *uvc = video_get_drvdata(vdev); 327 struct uvc_device *uvc = video_get_drvdata(vdev);
328 328
329 return uvc_queue_mmap(&uvc->video.queue, vma); 329 return uvcg_queue_mmap(&uvc->video.queue, vma);
330} 330}
331 331
332static unsigned int 332static unsigned int
@@ -335,7 +335,7 @@ uvc_v4l2_poll(struct file *file, poll_table *wait)
335 struct video_device *vdev = video_devdata(file); 335 struct video_device *vdev = video_devdata(file);
336 struct uvc_device *uvc = video_get_drvdata(vdev); 336 struct uvc_device *uvc = video_get_drvdata(vdev);
337 337
338 return uvc_queue_poll(&uvc->video.queue, file, wait); 338 return uvcg_queue_poll(&uvc->video.queue, file, wait);
339} 339}
340 340
341#ifndef CONFIG_MMU 341#ifndef CONFIG_MMU
@@ -346,7 +346,7 @@ static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
346 struct video_device *vdev = video_devdata(file); 346 struct video_device *vdev = video_devdata(file);
347 struct uvc_device *uvc = video_get_drvdata(vdev); 347 struct uvc_device *uvc = video_get_drvdata(vdev);
348 348
349 return uvc_queue_get_unmapped_area(&uvc->video.queue, pgoff); 349 return uvcg_queue_get_unmapped_area(&uvc->video.queue, pgoff);
350} 350}
351#endif 351#endif
352 352
@@ -358,7 +358,7 @@ static struct v4l2_file_operations uvc_v4l2_fops = {
358 .mmap = uvc_v4l2_mmap, 358 .mmap = uvc_v4l2_mmap,
359 .poll = uvc_v4l2_poll, 359 .poll = uvc_v4l2_poll,
360#ifndef CONFIG_MMU 360#ifndef CONFIG_MMU
361 .get_unmapped_area = uvc_v4l2_get_unmapped_area, 361 .get_unmapped_area = uvcg_v4l2_get_unmapped_area,
362#endif 362#endif
363}; 363};
364 364