From patchwork Sun Mar 8 14:40:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 28577 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YUcOk-0000cL-LQ; Sun, 08 Mar 2015 15:41:42 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1YUcOi-00088w-8U; Sun, 08 Mar 2015 15:41:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817AbbCHOlN (ORCPT + 1 other); Sun, 8 Mar 2015 10:41:13 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:38123 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752786AbbCHOlL (ORCPT ); Sun, 8 Mar 2015 10:41:11 -0400 Received: by wevk48 with SMTP id k48so22376173wev.5; Sun, 08 Mar 2015 07:41:09 -0700 (PDT) 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=V2YZNUOK6iBB+nxgYuZmTtI2AKlHLvJNf/MShB3Tong=; b=zwtJZQDuYLnpzQAFFHdUu3NUghR7RPGv1huWJse5cKuKamqxEnMtsHZ9dFnTZoL25J bbezLlst9Q9OcMvgHQfUgGVXZljH8i5lcZLifRZJLOBOoIqnBpzXd1KFMtaU/Ig1Ar8v S1QRXE3YBqpYo7izThT8btDDIjUp0aMxQA1u/qUJmbhCDKdVo047+EmdxEzZP9Lsw6BF 5QPOPVmwDxn2Mq9i2tb+N0PeTbQTzChbbJBQOPkAJb0tEORIFY3/yIPMj8Ad5ZonVjvu OfmK/SuszmeOlKDST/+7eXd9v5CPa76BNIx8juVbVwKL94UvR/QZEjRYkALAX43SsvxA SLMg== X-Received: by 10.181.13.148 with SMTP id ey20mr51002640wid.18.1425825669590; Sun, 08 Mar 2015 07:41:09 -0700 (PDT) Received: from tango-charlie.Home (0545247b.skybroadband.com. [5.69.36.123]) by mx.google.com with ESMTPSA id ka1sm24040321wjc.2.2015.03.08.07.41.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Mar 2015 07:41:08 -0700 (PDT) From: Lad Prabhakar To: Scott Jiang , linux-media@vger.kernel.org, Hans Verkuil Cc: adi-buildroot-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, "Lad, Prabhakar" Subject: [PATCH v4 07/17] media: blackfin: bfin_capture: use v4l2_fh_open and vb2_fop_release Date: Sun, 8 Mar 2015 14:40:43 +0000 Message-Id: <1425825653-14768-8-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425825653-14768-1-git-send-email-prabhakar.csengg@gmail.com> References: <1425825653-14768-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-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.3.8.143619 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" this patch adds support to use v4l2_fh_open() and vb2_fop_release, which allows to drop driver specific struct bcap_fh, as this is handled by core. Signed-off-by: Lad, Prabhakar Acked-by: Scott Jiang Tested-by: Scott Jiang --- drivers/media/platform/blackfin/bfin_capture.c | 79 +------------------------- 1 file changed, 2 insertions(+), 77 deletions(-) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 84827d2..01e778d 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -105,12 +105,6 @@ struct bcap_device { bool stop; }; -struct bcap_fh { - struct v4l2_fh fh; - /* indicates whether this file handle is doing IO */ - bool io_allowed; -}; - static const struct bcap_format bcap_formats[] = { { .desc = "YCbCr 4:2:2 Interleaved UYVY", @@ -200,50 +194,6 @@ static void bcap_free_sensor_formats(struct bcap_device *bcap_dev) bcap_dev->sensor_formats = NULL; } -static int bcap_open(struct file *file) -{ - struct bcap_device *bcap_dev = video_drvdata(file); - struct video_device *vfd = bcap_dev->video_dev; - struct bcap_fh *bcap_fh; - - if (!bcap_dev->sd) { - v4l2_err(&bcap_dev->v4l2_dev, "No sub device registered\n"); - return -ENODEV; - } - - bcap_fh = kzalloc(sizeof(*bcap_fh), GFP_KERNEL); - if (!bcap_fh) { - v4l2_err(&bcap_dev->v4l2_dev, - "unable to allocate memory for file handle object\n"); - return -ENOMEM; - } - - v4l2_fh_init(&bcap_fh->fh, vfd); - - /* store pointer to v4l2_fh in private_data member of file */ - file->private_data = &bcap_fh->fh; - v4l2_fh_add(&bcap_fh->fh); - bcap_fh->io_allowed = false; - return 0; -} - -static int bcap_release(struct file *file) -{ - struct bcap_device *bcap_dev = video_drvdata(file); - struct v4l2_fh *fh = file->private_data; - struct bcap_fh *bcap_fh = container_of(fh, struct bcap_fh, fh); - - /* if this instance is doing IO */ - if (bcap_fh->io_allowed) - vb2_queue_release(&bcap_dev->buffer_queue); - - file->private_data = NULL; - v4l2_fh_del(&bcap_fh->fh); - v4l2_fh_exit(&bcap_fh->fh); - kfree(bcap_fh); - return 0; -} - #ifndef CONFIG_MMU static unsigned long bcap_get_unmapped_area(struct file *file, unsigned long addr, @@ -436,13 +386,6 @@ static int bcap_reqbufs(struct file *file, void *priv, { struct bcap_device *bcap_dev = video_drvdata(file); struct vb2_queue *vq = &bcap_dev->buffer_queue; - struct v4l2_fh *fh = file->private_data; - struct bcap_fh *bcap_fh = container_of(fh, struct bcap_fh, fh); - - if (vb2_is_busy(vq)) - return -EBUSY; - - bcap_fh->io_allowed = true; return vb2_reqbufs(vq, req_buf); } @@ -459,11 +402,6 @@ static int bcap_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf) { struct bcap_device *bcap_dev = video_drvdata(file); - struct v4l2_fh *fh = file->private_data; - struct bcap_fh *bcap_fh = container_of(fh, struct bcap_fh, fh); - - if (!bcap_fh->io_allowed) - return -EBUSY; return vb2_qbuf(&bcap_dev->buffer_queue, buf); } @@ -472,11 +410,6 @@ static int bcap_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf) { struct bcap_device *bcap_dev = video_drvdata(file); - struct v4l2_fh *fh = file->private_data; - struct bcap_fh *bcap_fh = container_of(fh, struct bcap_fh, fh); - - if (!bcap_fh->io_allowed) - return -EBUSY; return vb2_dqbuf(&bcap_dev->buffer_queue, buf, file->f_flags & O_NONBLOCK); @@ -527,14 +460,10 @@ static int bcap_streamon(struct file *file, void *priv, enum v4l2_buf_type buf_type) { struct bcap_device *bcap_dev = video_drvdata(file); - struct bcap_fh *fh = file->private_data; struct ppi_if *ppi = bcap_dev->ppi; dma_addr_t addr; int ret; - if (!fh->io_allowed) - return -EBUSY; - /* call streamon to start streaming in videobuf */ ret = vb2_streamon(&bcap_dev->buffer_queue, buf_type); if (ret) @@ -568,10 +497,6 @@ static int bcap_streamoff(struct file *file, void *priv, enum v4l2_buf_type buf_type) { struct bcap_device *bcap_dev = video_drvdata(file); - struct bcap_fh *fh = file->private_data; - - if (!fh->io_allowed) - return -EBUSY; return vb2_streamoff(&bcap_dev->buffer_queue, buf_type); } @@ -874,8 +799,8 @@ static const struct v4l2_ioctl_ops bcap_ioctl_ops = { static struct v4l2_file_operations bcap_fops = { .owner = THIS_MODULE, - .open = bcap_open, - .release = bcap_release, + .open = v4l2_fh_open, + .release = vb2_fop_release, .unlocked_ioctl = video_ioctl2, .mmap = vb2_fop_mmap, #ifndef CONFIG_MMU