From patchwork Mon Feb 23 20:19:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5868111 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E9DEC9F37F for ; Mon, 23 Feb 2015 20:21:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 268832064B for ; Mon, 23 Feb 2015 20:21:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38E5F20648 for ; Mon, 23 Feb 2015 20:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176AbbBWUUp (ORCPT ); Mon, 23 Feb 2015 15:20:45 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:42922 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372AbbBWUTo (ORCPT ); Mon, 23 Feb 2015 15:19:44 -0500 Received: by mail-wi0-f176.google.com with SMTP id h11so20636948wiw.3; Mon, 23 Feb 2015 12:19:42 -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=NmgDQU4zFOUVUlWy19P4TokOXGAzKTR3SpxF81m+DYA=; b=nT5sXeEzaCSnlGuFEtzTITdh7X+85zqDKqRZtc0Il7EO7/8IlISBYHNIH4YFCLUTo7 yBOiqF7kT+1HRejdAnk6s88GiLDwZdMu1f5k9zoDukejPKwQ2ScaOP5jC0vPYSDGh8WH EXSGApGfJcLRlnCMH+0VbdxdA3+Uh5yAF4ypTczdlw3JmU20i4TiZffAu3LrysUaE1cf PVbFhBty4c5CgRxyNxFqjfSwYMh4TVGSUzN4qVT9vdFZyExwoHrbYN3OUwJZmf4FJCeI miTvAwrulz1hmdqx6dSajB1Cl/zjOQb3JEaFBg0Wm9ejIMIbNTa24LQVC1gtnITczcXV sTog== X-Received: by 10.194.48.12 with SMTP id h12mr26458435wjn.74.1424722782672; Mon, 23 Feb 2015 12:19:42 -0800 (PST) Received: from tango-charlie.Home (0545247b.skybroadband.com. [5.69.36.123]) by mx.google.com with ESMTPSA id bf8sm48103517wjb.37.2015.02.23.12.19.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Feb 2015 12:19:41 -0800 (PST) From: Lad Prabhakar To: Laurent Pinchart , Sakari Ailus Cc: LMML , LKML , "Lad, Prabhakar" Subject: [PATCH 3/3] media: omap3isp: ispvideo: use vb2_fop_mmap/poll Date: Mon, 23 Feb 2015 20:19:33 +0000 Message-Id: <1424722773-20131-4-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424722773-20131-1-git-send-email-prabhakar.csengg@gmail.com> References: <1424722773-20131-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 From: "Lad, Prabhakar" No need to reinvent the wheel. Just use the already existing functions provided v4l-core. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/omap3isp/ispvideo.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index b648176..5dd5ffc 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -1277,37 +1277,13 @@ static int isp_video_release(struct file *file) return ret; } -static unsigned int isp_video_poll(struct file *file, poll_table *wait) -{ - struct isp_video *video = video_drvdata(file); - int ret; - - mutex_lock(&video->queue_lock); - ret = vb2_poll(&video->queue, file, wait); - mutex_unlock(&video->queue_lock); - - return ret; -} - -static int isp_video_mmap(struct file *file, struct vm_area_struct *vma) -{ - struct isp_video *video = video_drvdata(file); - int ret; - - mutex_lock(&video->queue_lock); - ret = vb2_mmap(&video->queue, vma); - mutex_unlock(&video->queue_lock); - - return ret; -} - static struct v4l2_file_operations isp_video_fops = { .owner = THIS_MODULE, .unlocked_ioctl = video_ioctl2, .open = isp_video_open, .release = isp_video_release, - .poll = isp_video_poll, - .mmap = isp_video_mmap, + .poll = vb2_fop_poll, + .mmap = vb2_fop_mmap, }; /* ----------------------------------------------------------------------------- @@ -1389,6 +1365,8 @@ int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev) video->video.v4l2_dev = vdev; + /* queue isnt initalized */ + video->video.queue = &video->queue; ret = video_register_device(&video->video, VFL_TYPE_GRABBER, -1); if (ret < 0) dev_err(video->isp->dev,