From patchwork Mon May 26 19:50:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 4244861 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 692CD9F333 for ; Mon, 26 May 2014 19:50:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A4492201BA for ; Mon, 26 May 2014 19:50:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FF3D2017D for ; Mon, 26 May 2014 19:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015AbaEZTuG (ORCPT ); Mon, 26 May 2014 15:50:06 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:49826 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbaEZTuE (ORCPT ); Mon, 26 May 2014 15:50:04 -0400 Received: from avalon.ideasonboard.com (30.141-246-81.adsl-dyn.isp.belgacom.be [81.246.141.30]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2DEC535A46; Mon, 26 May 2014 21:49:48 +0200 (CEST) From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Julien BERAUD , Boris Todorov , Gary Thomas , Enrico , Stefan Herbrechtsmeier , Javier Martinez Canillas , Chris Whittenburg , Sakari Ailus Subject: [PATCH 04/11] omap3isp: Move non-critical code out of the mutex-protected section Date: Mon, 26 May 2014 21:50:05 +0200 Message-Id: <1401133812-8745-5-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.8.5.5 In-Reply-To: <1401133812-8745-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1401133812-8745-1-git-send-email-laurent.pinchart@ideasonboard.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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 The isp_video_pix_to_mbus() and isp_video_mbus_to_pix() calls in isp_video_set_format() only access static fields of the isp_video structure. They don't need to be protected by a mutex. Signed-off-by: Laurent Pinchart --- drivers/media/platform/omap3isp/ispvideo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index 04d45e7..2876f34 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -631,17 +631,16 @@ isp_video_set_format(struct file *file, void *fh, struct v4l2_format *format) if (format->type != video->type) return -EINVAL; - mutex_lock(&video->mutex); - /* Fill the bytesperline and sizeimage fields by converting to media bus * format and back to pixel format. */ isp_video_pix_to_mbus(&format->fmt.pix, &fmt); isp_video_mbus_to_pix(video, &fmt, &format->fmt.pix); + mutex_lock(&video->mutex); vfh->format = *format; - mutex_unlock(&video->mutex); + return 0; }