[media] uvcvideo: Rename and split uvc_queue_enable to uvc_queue_stream(on|off)

This brings the function name in line with the V4L2 API terminology and
allows removing the duplicate queue type check.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index ab1e2fd0a599ed3f5ec3b413a97f491ffcd3eb92..6a4b0b8cd2706a40282386d0eab89e4d551ef27c 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2038,7 +2038,8 @@ static int __uvc_resume(struct usb_interface *intf, int reset)
                if (stream->intf == intf) {
                        ret = uvc_video_resume(stream, reset);
                        if (ret < 0)
-                               uvc_queue_enable(&stream->queue, 0);
+                               uvc_queue_streamoff(&stream->queue,
+                                                   stream->queue.queue.type);
                        return ret;
                }
        }

diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 5c11de0df4b64fe8dfbfaa68db4ea63c22be1242..c295c5c719c8615a61e70a7da1b777ed9f20e286 100644 (file)
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -263,6 +263,28 @@ int uvc_dequeue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf,
        return ret;
 }
 
+int uvc_queue_streamon(struct uvc_video_queue *queue, enum v4l2_buf_type type)
+{
+       int ret;
+
+       mutex_lock(&queue->mutex);
+       ret = vb2_streamon(&queue->queue, type);
+       mutex_unlock(&queue->mutex);
+
+       return ret;
+}
+
+int uvc_queue_streamoff(struct uvc_video_queue *queue, enum v4l2_buf_type type)
+{
+       int ret;
+
+       mutex_lock(&queue->mutex);
+       ret = vb2_streamoff(&queue->queue, type);
+       mutex_unlock(&queue->mutex);
+
+       return ret;
+}
+
 int uvc_queue_mmap(struct uvc_video_queue *queue, struct vm_area_struct *vma)
 {
        int ret;
@@ -317,37 +339,6 @@ int uvc_queue_allocated(struct uvc_video_queue *queue)
        return allocated;
 }
 
-/*
- * Enable or disable the video buffers queue.
- *
- * The queue must be enabled before starting video acquisition and must be
- * disabled after stopping it. This ensures that the video buffers queue
- * state can be properly initialized before buffers are accessed from the
- * interrupt handler.
- *
- * Enabling the video queue returns -EBUSY if the queue is already enabled.
- *
- * Disabling the video queue cancels the queue and removes all buffers from
- * the main queue.
- *
- * This function can't be called from interrupt context. Use
- * uvc_queue_cancel() instead.
- */
-int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
-{
-       int ret;
-
-       mutex_lock(&queue->mutex);
-
-       if (enable)
-               ret = vb2_streamon(&queue->queue, queue->queue.type);
-       else
-               ret = vb2_streamoff(&queue->queue, queue->queue.type);
-
-       mutex_unlock(&queue->mutex);
-       return ret;
-}
-
 /*
  * Cancel the video buffers queue.
  *

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 5ba023be39263849a7c1f77f0f96edc5cdc39237..9c5cbcf16529ffb39fca3c9c1fd48c38edd760d2 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -757,14 +757,11 @@ static int uvc_ioctl_streamon(struct file *file, void *fh,
        struct uvc_streaming *stream = handle->stream;
        int ret;
 
-       if (type != stream->type)
-               return -EINVAL;
-
        if (!uvc_has_privileges(handle))
                return -EBUSY;
 
        mutex_lock(&stream->mutex);
-       ret = uvc_queue_enable(&stream->queue, 1);
+       ret = uvc_queue_streamon(&stream->queue, type);
        mutex_unlock(&stream->mutex);
 
        return ret;
@@ -776,14 +773,11 @@ static int uvc_ioctl_streamoff(struct file *file, void *fh,
        struct uvc_fh *handle = fh;
        struct uvc_streaming *stream = handle->stream;
 
-       if (type != stream->type)
-               return -EINVAL;
-
        if (!uvc_has_privileges(handle))
                return -EBUSY;
 
        mutex_lock(&stream->mutex);
-       uvc_queue_enable(&stream->queue, 0);
+       uvc_queue_streamoff(&stream->queue, type);
        mutex_unlock(&stream->mutex);
 
        return 0;

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 2dc247a0ce346f9c229dc2e70cbe601388d046bd..f0a04b532edec408523aae1d9e232351739f5f62 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -634,7 +634,10 @@ extern int uvc_queue_buffer(struct uvc_video_queue *queue,
                struct v4l2_buffer *v4l2_buf);
 extern int uvc_dequeue_buffer(struct uvc_video_queue *queue,
                struct v4l2_buffer *v4l2_buf, int nonblocking);
-extern int uvc_queue_enable(struct uvc_video_queue *queue, int enable);
+extern int uvc_queue_streamon(struct uvc_video_queue *queue,
+                             enum v4l2_buf_type type);
+extern int uvc_queue_streamoff(struct uvc_video_queue *queue,
+                              enum v4l2_buf_type type);
 extern void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect);
 extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
                struct uvc_buffer *buf);