From patchwork Wed Nov 26 22:42:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5389411 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 0D247C11AC for ; Wed, 26 Nov 2014 22:44:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EDC4201C8 for ; Wed, 26 Nov 2014 22:44:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5048A201B4 for ; Wed, 26 Nov 2014 22:44:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753830AbaKZWoi (ORCPT ); Wed, 26 Nov 2014 17:44:38 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:36200 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753570AbaKZWnX (ORCPT ); Wed, 26 Nov 2014 17:43:23 -0500 Received: by mail-wi0-f180.google.com with SMTP id n3so6524865wiv.7 for ; Wed, 26 Nov 2014 14:43:22 -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=zlPfrcoJ9OS7gerdhPXX5ounX1WMQDcPS5hWG81UvdM=; b=liel355g/9iTA1LCmghfIF9/fyaUclIPsSu1KV0173NDXvEBwt80awe/wicj68JJSE 8iTZ/y5PzWGTvj7bwkeuU/Ys9/jZp8FH/7c90kx/O6hFOTCGu4mIGHdVESXo/MFwec2w /qjEbPTvDfmSyzuvTMl8hgh2Pqu753PUGkYYacnFj9iZ1P59DgcEWvuzoLuqTbd8uZ4X tWI/2zM/SxcaClpiS8ctBv0blwcgxBMipUv5r78/uounpwSXMh6kVoemyYpGudAcZlVe 3AwRCto/4Haew2+kXjH0TClwgPsMjhQlEkZLuWMmSr+Uf6rwIZe1BjsywyMCkyCRSQg/ LXcg== X-Received: by 10.180.75.42 with SMTP id z10mr658490wiv.70.1417041802518; Wed, 26 Nov 2014 14:43:22 -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.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 14:43:21 -0800 (PST) From: "Lad, Prabhakar" To: LMML Cc: linux-kernel@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" Subject: [PATCH v2 08/11] media: blackfin: use vb2_ops_wait_prepare/finish helper Date: Wed, 26 Nov 2014 22:42:31 +0000 Message-Id: <1417041754-8714-9-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 Acked-by: 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)