From patchwork Tue Nov 18 11:23:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5327531 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 35E25C11AC for ; Tue, 18 Nov 2014 11:26:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BE4320179 for ; Tue, 18 Nov 2014 11:26:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3DFD20136 for ; Tue, 18 Nov 2014 11:26:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754403AbaKRLZi (ORCPT ); Tue, 18 Nov 2014 06:25:38 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:32910 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754234AbaKRLYK (ORCPT ); Tue, 18 Nov 2014 06:24:10 -0500 Received: by mail-wi0-f171.google.com with SMTP id bs8so1452178wib.10 for ; Tue, 18 Nov 2014 03:24:09 -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=axvZEOXXw92hY6OjuKMnR76g91F6E8cVNJmzdGpoHLI=; b=eYs0y2Y220FbyuQeJqiQviw6dAlVRr0upvMbuGZPFj3kLLIGlBORc/rKSbpDCz3eXU zmJV70qUEUpsLTF9hUeBQxYunkDJBjny1alKnbvPYd1VthmTme4id6/oPWi4yquSyVCS 1GfvpldhtVmDE4+fFtwVX9mjckCpMv9J8J11lUiDZ06NqewC7EGDiA6ieEyCHi5/Ds9p tVOGv2Nj8jR8sKiZhqkEEAYpuE7KF0knuQaWTh2f3UgTX3InaCNsN/v0iUikOHge8RN6 iMfa/agCJSekVA1vmiaDRwwaa7FZHAT8FuBI2Kt3PGIVDpV9i7Icw96zBOsC5Tij9aeP EfOA== X-Received: by 10.194.243.164 with SMTP id wz4mr2568072wjc.129.1416309849142; Tue, 18 Nov 2014 03:24:09 -0800 (PST) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id cu9sm55428904wjb.0.2014.11.18.03.24.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Nov 2014 03:24:08 -0800 (PST) From: "Lad, Prabhakar" To: Hans Verkuil , Mauro Carvalho Chehab , LMML Cc: LKML , "Lad, Prabhakar" , Scott Jiang Subject: [PATCH 08/12] media: blackfin: use vb2_ops_wait_prepare/finish helper Date: Tue, 18 Nov 2014 11:23:37 +0000 Message-Id: <1416309821-5426-9-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416309821-5426-1-git-send-email-prabhakar.csengg@gmail.com> References: <1416309821-5426-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 Signed-off-by: Lad, Prabhakar Cc: Scott Jiang --- drivers/media/platform/blackfin/bfin_capture.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index b3345b3..819ec0e 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -349,18 +349,6 @@ static void bcap_buffer_cleanup(struct vb2_buffer *vb) spin_unlock_irqrestore(&bcap_dev->lock, flags); } -static void bcap_lock(struct vb2_queue *vq) -{ - struct bcap_device *bcap_dev = vb2_get_drv_priv(vq); - mutex_lock(&bcap_dev->mutex); -} - -static void bcap_unlock(struct vb2_queue *vq) -{ - struct bcap_device *bcap_dev = vb2_get_drv_priv(vq); - mutex_unlock(&bcap_dev->mutex); -} - static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) { struct bcap_device *bcap_dev = vb2_get_drv_priv(vq); @@ -457,8 +445,8 @@ static struct vb2_ops bcap_video_qops = { .buf_prepare = bcap_buffer_prepare, .buf_cleanup = bcap_buffer_cleanup, .buf_queue = bcap_buffer_queue, - .wait_prepare = bcap_unlock, - .wait_finish = bcap_lock, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, .start_streaming = bcap_start_streaming, .stop_streaming = bcap_stop_streaming, }; @@ -995,6 +983,7 @@ static int bcap_probe(struct platform_device *pdev) q->ops = &bcap_video_qops; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + q->lock = &bcap_dev->mutex; ret = vb2_queue_init(q); if (ret)