From patchwork Sat Dec 20 10:47:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5522251 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B80C9F1CD for ; Sat, 20 Dec 2014 10:51:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DF3620125 for ; Sat, 20 Dec 2014 10:51:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D3E8200F4 for ; Sat, 20 Dec 2014 10:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752994AbaLTKsg (ORCPT ); Sat, 20 Dec 2014 05:48:36 -0500 Received: from mail-pd0-f169.google.com ([209.85.192.169]:39767 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752923AbaLTKsc (ORCPT ); Sat, 20 Dec 2014 05:48:32 -0500 Received: by mail-pd0-f169.google.com with SMTP id z10so2809318pdj.28; Sat, 20 Dec 2014 02:48:31 -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=43S62GxCRYCrT4pZzX1vrB6vANop+Hs2L4OoRwM3Z+E=; b=G5oPs7YmiNHdbaGQjdcLyOVV8EMeXIP3i6Yadhik9Dvb/mW0EOQdSepUtcgD4Sa8b+ 5i3atSdzmjSLXHchpdD+D2vdwyejAqO4XF+ZyWRsWsw3PGpLV4sNxxBiDLI8xu26ci9A poGpsqekZaYyTi8H2SEJMNBVY0JNgdtQKwLlgKIOHHBAvN/BaMmm1lwj+bPwR1SU0Mep iJCANQkWdhg4yw+7vavnQ3M/vwyqnj8Av0042iQVSssDMXOseSvcvGNioXuVt8fscnYp 6yk7S4IGHX9f+o++JKUDDtCWj/yNHf02AkqsC8YVIdVx8QEB8gyB8SpxApMYVNpN4C1u eLQA== X-Received: by 10.70.92.45 with SMTP id cj13mr19609202pdb.65.1419072511599; Sat, 20 Dec 2014 02:48:31 -0800 (PST) Received: from localhost.localdomain ([49.203.40.145]) by mx.google.com with ESMTPSA id w8sm12007015pbt.71.2014.12.20.02.48.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 20 Dec 2014 02:48:30 -0800 (PST) From: "Lad, Prabhakar" To: LMML , Scott Jiang Cc: LKML , adi-buildroot-devel@lists.sourceforge.net, Mauro Carvalho Chehab , "Lad, Prabhakar" Subject: [PATCH 07/15] media: blackfin: bfin_capture: use v4l2_fh_open and vb2_fop_release Date: Sat, 20 Dec 2014 16:17:34 +0530 Message-Id: <1419072462-3168-8-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1419072462-3168-1-git-send-email-prabhakar.csengg@gmail.com> References: <1419072462-3168-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 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 --- 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 df4a6b4..30f1fe0 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, @@ -432,13 +382,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); } @@ -455,11 +398,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); } @@ -468,11 +406,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); @@ -523,14 +456,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) @@ -564,10 +493,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); } @@ -870,8 +795,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