From patchwork Tue Nov 18 11:23:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5327741 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 EA809C11AC for ; Tue, 18 Nov 2014 11:26:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE81C20172 for ; Tue, 18 Nov 2014 11:26:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 848CD2012B for ; Tue, 18 Nov 2014 11:26:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754477AbaKRL0c (ORCPT ); Tue, 18 Nov 2014 06:26:32 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:62920 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754023AbaKRLYJ (ORCPT ); Tue, 18 Nov 2014 06:24:09 -0500 Received: by mail-wi0-f171.google.com with SMTP id bs8so1463225wib.4 for ; Tue, 18 Nov 2014 03:24:08 -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=oklCVBGiwEaYRmILkZ/8BWizxwQfNEOQsk5PtOGalt4=; b=BsqNId9eI/mQmxDLenLma7lR3u39MN02LfmLzkWdp6vlvc6Q1txkJ4KcW6Z+34jD7V b9qgMBS/k3nxsA0KZrOMfCwBSduGDZeoR3LKjxlD4Vk4Xodw7ZE/1ewo3CUWUffmJaUV NTL1N9o87ya8oWsY4z4Y7Ghw3Tb2CU0H/5+1quCHf4XchHGJyKucvMpRJSCmoeuDpZlk pGtPXnYatTl+KtRb3ug7BuRDJF2CIxiuS8sWcpzOsEyGJ4TBXpCEl3PXUzVps4fiYrPW nbKj9roPhyicNZQDB216uBQRs9AayAJ2SQVLm6ceofG94ot6PGKlf51XX4dqEZuMZlIg 3EwQ== X-Received: by 10.194.209.180 with SMTP id mn20mr47081603wjc.49.1416309847957; Tue, 18 Nov 2014 03:24:07 -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.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Nov 2014 03:24:07 -0800 (PST) From: "Lad, Prabhakar" To: Hans Verkuil , Mauro Carvalho Chehab , LMML Cc: LKML , "Lad, Prabhakar" , Kyungmin Park , Tomasz Stanislawski Subject: [PATCH 07/12] media: s5p-tv: use vb2_ops_wait_prepare/finish helper Date: Tue, 18 Nov 2014 11:23:36 +0000 Message-Id: <1416309821-5426-8-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: Kyungmin Park Cc: Tomasz Stanislawski --- drivers/media/platform/s5p-tv/mixer_video.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index b4d2696..72d4f2e 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c @@ -926,22 +926,6 @@ static void buf_queue(struct vb2_buffer *vb) mxr_dbg(mdev, "queuing buffer\n"); } -static void wait_lock(struct vb2_queue *vq) -{ - struct mxr_layer *layer = vb2_get_drv_priv(vq); - - mxr_dbg(layer->mdev, "%s\n", __func__); - mutex_lock(&layer->mutex); -} - -static void wait_unlock(struct vb2_queue *vq) -{ - struct mxr_layer *layer = vb2_get_drv_priv(vq); - - mxr_dbg(layer->mdev, "%s\n", __func__); - mutex_unlock(&layer->mutex); -} - static int start_streaming(struct vb2_queue *vq, unsigned int count) { struct mxr_layer *layer = vb2_get_drv_priv(vq); @@ -1040,8 +1024,8 @@ static void stop_streaming(struct vb2_queue *vq) static struct vb2_ops mxr_video_qops = { .queue_setup = queue_setup, .buf_queue = buf_queue, - .wait_prepare = wait_unlock, - .wait_finish = wait_lock, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, .start_streaming = start_streaming, .stop_streaming = stop_streaming, }; @@ -1122,6 +1106,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, .ops = &mxr_video_qops, .min_buffers_needed = 1, .mem_ops = &vb2_dma_contig_memops, + .lock = &layer->mutex, }; return layer;