From patchwork Wed Nov 26 22:42:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5389361 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1FE979F319 for ; Wed, 26 Nov 2014 22:43:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D64320149 for ; Wed, 26 Nov 2014 22:43:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05806201C8 for ; Wed, 26 Nov 2014 22:43:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753730AbaKZWnn (ORCPT ); Wed, 26 Nov 2014 17:43:43 -0500 Received: from mail-wg0-f42.google.com ([74.125.82.42]:44888 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753664AbaKZWn1 (ORCPT ); Wed, 26 Nov 2014 17:43:27 -0500 Received: by mail-wg0-f42.google.com with SMTP id z12so5015106wgg.29 for ; Wed, 26 Nov 2014 14:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pdZLqvDYSDVan9oYx7UyhTZK4GPZfneM/kGbgj6ChOg=; b=yeOoAuiGAYMoXNaSBt7DtmzeSMA7Rs9oC89SS463gG785WmQhDjHmKr6/R2Slf0qsS HoDFiOhS/hyNTCnWPCFJXYgmVnZwCiptMh3ypeLmioLNFNmXBkitXFjvVNXpYK95EWts 2CeOKUdf/K8kbls9nQbBLyZWLSrzBJsAmsrLwk2I40MwLtXyNX3VjQ31T2KgQue8MOvo qBCiDo+X86QOXcQTgs51QfbCWpOdwZae7XCMJaggcvA5okZFRvb/tbQBkDMkJy0MjGjd 2MzhF1Sy9FE+Kt/Jl1lumSLT7TVbnolnRXCsGBZQ4AhZ4e/wH2sluQIb5+E2Zwmk7YvZ MYFA== X-Received: by 10.180.221.201 with SMTP id qg9mr45997699wic.29.1417041806440; Wed, 26 Nov 2014 14:43:26 -0800 (PST) Received: from tango-charlie.Home ([90.208.178.234]) by mx.google.com with ESMTPSA id d5sm8141939wjb.34.2014.11.26.14.43.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 14:43:25 -0800 (PST) From: "Lad, Prabhakar" To: LMML Cc: linux-kernel@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" , Laurent Pinchart Subject: [PATCH v2 11/11] media: usb: uvc: use vb2_ops_wait_prepare/finish helper Date: Wed, 26 Nov 2014 22:42:34 +0000 Message-Id: <1417041754-8714-12-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417041754-8714-1-git-send-email-prabhakar.csengg@gmail.com> References: <1417041754-8714-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch drops driver specific wait_prepare() and wait_finish() callbacks from vb2_ops and instead uses the the helpers vb2_ops_wait_prepare/finish() provided by the vb2 core, the lock member of the queue needs to be initalized to a mutex so that vb2 helpers vb2_ops_wait_prepare/finish() can make use of it. Signed-off-by: Lad, Prabhakar Cc: Laurent Pinchart --- drivers/media/usb/uvc/uvc_queue.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index cc96072..64147b5 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -143,20 +143,6 @@ 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 int uvc_start_streaming(struct vb2_queue *vq, unsigned int count) { struct uvc_video_queue *queue = vb2_get_drv_priv(vq); @@ -195,8 +181,8 @@ static struct vb2_ops uvc_queue_qops = { .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, .start_streaming = uvc_start_streaming, .stop_streaming = uvc_stop_streaming, };