From patchwork Wed Nov 26 22:42:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5389431 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 98C98C11AD for ; Wed, 26 Nov 2014 22:45:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA94B20145 for ; Wed, 26 Nov 2014 22:45:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBEEB201EC for ; Wed, 26 Nov 2014 22:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753826AbaKZWoz (ORCPT ); Wed, 26 Nov 2014 17:44:55 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:35541 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbaKZWnV (ORCPT ); Wed, 26 Nov 2014 17:43:21 -0500 Received: by mail-wi0-f170.google.com with SMTP id bs8so16852901wib.5 for ; Wed, 26 Nov 2014 14:43:19 -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=UYs2RkSompmTCeko1CZy5X+RmItOgd6B1jVeBpsf5xY=; b=Dqv4J1yRGL5OItTl2aMsr5P4ZBG/s+8+M7GMoW2TPoigM6PJhq24GMNKxE5KvIDq2C RnSfQPLY+bieQeR9AxEDZnG9Nv4u8JJxG4KqZwot4QF+1VkrMcd4k52+74QN2arz6lZF g+DjqRSneFm18AoNkj3IeYSCr8ATIp1jpuzqJbyecsSEwRrFwuBsW183WRKkSu+YBpmu Cxrr/J90z70skqFp0iH5k3gpVvm0z5pLS060msTCnCEt3FPu9yyYAXVqRI8FpEXX/wqM K+I57mUEz/t+Y2i1CMp+PKkqnbu7zt5XRxPQOWgPV4s2uF1yyu/9UnCthzaNTdfxBkv2 57VA== X-Received: by 10.194.150.148 with SMTP id ui20mr52509053wjb.90.1417041799826; Wed, 26 Nov 2014 14:43:19 -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.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 14:43:18 -0800 (PST) From: "Lad, Prabhakar" To: LMML Cc: linux-kernel@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" , Jonathan Corbet Subject: [PATCH v2 06/11] media: marvell-ccic: use vb2_ops_wait_prepare/finish helper Date: Wed, 26 Nov 2014 22:42:29 +0000 Message-Id: <1417041754-8714-7-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: Jonathan Corbet Acked-by: Jonathan Corbet --- drivers/media/platform/marvell-ccic/mcam-core.c | 29 +++++-------------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index ce00cba..4ec29c0 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -1102,26 +1102,6 @@ static void mcam_vb_buf_queue(struct vb2_buffer *vb) mcam_read_setup(cam); } - -/* - * vb2 uses these to release the mutex when waiting in dqbuf. I'm - * not actually sure we need to do this (I'm not sure that vb2_dqbuf() needs - * to be called with the mutex held), but better safe than sorry. - */ -static void mcam_vb_wait_prepare(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - mutex_unlock(&cam->s_mutex); -} - -static void mcam_vb_wait_finish(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - mutex_lock(&cam->s_mutex); -} - /* * These need to be called with the mutex held from vb2 */ @@ -1191,8 +1171,8 @@ static const struct vb2_ops mcam_vb2_ops = { .buf_queue = mcam_vb_buf_queue, .start_streaming = mcam_vb_start_streaming, .stop_streaming = mcam_vb_stop_streaming, - .wait_prepare = mcam_vb_wait_prepare, - .wait_finish = mcam_vb_wait_finish, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, }; @@ -1252,8 +1232,8 @@ static const struct vb2_ops mcam_vb2_sg_ops = { .buf_cleanup = mcam_vb_sg_buf_cleanup, .start_streaming = mcam_vb_start_streaming, .stop_streaming = mcam_vb_stop_streaming, - .wait_prepare = mcam_vb_wait_prepare, - .wait_finish = mcam_vb_wait_finish, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, }; #endif /* MCAM_MODE_DMA_SG */ @@ -1265,6 +1245,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam) memset(vq, 0, sizeof(*vq)); vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; vq->drv_priv = cam; + vq->lock = &cam->s_mutex; INIT_LIST_HEAD(&cam->buffers); switch (cam->buffer_mode) { case B_DMA_contig: