lkml.org 
[lkml]   [2014]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/12] media: usb: uvc: use vb2_ops_wait_prepare/finish helper
    Date
    Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
    Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    ---
    drivers/media/usb/uvc/uvc_queue.c | 19 +++----------------
    1 file changed, 3 insertions(+), 16 deletions(-)

    diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
    index 6e92d20..9c42ac6f 100644
    --- a/drivers/media/usb/uvc/uvc_queue.c
    +++ b/drivers/media/usb/uvc/uvc_queue.c
    @@ -117,27 +117,13 @@ static void uvc_buffer_finish(struct vb2_buffer *vb)
    uvc_video_clock_update(stream, &vb->v4l2_buf, buf);
    }

    -static void uvc_wait_prepare(struct vb2_queue *vq)
    -{
    - struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
    -
    - mutex_unlock(&queue->mutex);
    -}
    -
    -static void uvc_wait_finish(struct vb2_queue *vq)
    -{
    - struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
    -
    - mutex_lock(&queue->mutex);
    -}
    -
    static struct vb2_ops uvc_queue_qops = {
    .queue_setup = uvc_queue_setup,
    .buf_prepare = uvc_buffer_prepare,
    .buf_queue = uvc_buffer_queue,
    .buf_finish = uvc_buffer_finish,
    - .wait_prepare = uvc_wait_prepare,
    - .wait_finish = uvc_wait_finish,
    + .wait_prepare = vb2_ops_wait_prepare,
    + .wait_finish = vb2_ops_wait_finish,
    };

    int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
    @@ -153,6 +139,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
    queue->queue.mem_ops = &vb2_vmalloc_memops;
    queue->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC
    | V4L2_BUF_FLAG_TSTAMP_SRC_SOE;
    + queue->queue.lock = &queue->mutex;
    ret = vb2_queue_init(&queue->queue);
    if (ret)
    return ret;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-11-18 13:01    [W:5.111 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site