From patchwork Wed Jul 22 22:42:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 6847531 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 C894C9F1D4 for ; Wed, 22 Jul 2015 22:42:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A8B320396 for ; Wed, 22 Jul 2015 22:42:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D0CC20221 for ; Wed, 22 Jul 2015 22:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752827AbbGVWmt (ORCPT ); Wed, 22 Jul 2015 18:42:49 -0400 Received: from resqmta-po-06v.sys.comcast.net ([96.114.154.165]:57501 "EHLO resqmta-po-06v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752586AbbGVWmr (ORCPT ); Wed, 22 Jul 2015 18:42:47 -0400 Received: from resomta-po-03v.sys.comcast.net ([96.114.154.227]) by resqmta-po-06v.sys.comcast.net with comcast id vaim1q00B4ueUHc01aim29; Wed, 22 Jul 2015 22:42:46 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-03v.sys.comcast.net with comcast id vaik1q00C1LXgTt01aikgl; Wed, 22 Jul 2015 22:42:46 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id 3FD4F120445; Wed, 22 Jul 2015 16:42:44 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, tiwai@suse.de, sakari.ailus@linux.intel.com, perex@perex.cz, crope@iki.fi, arnd@arndb.de, stefanr@s5r6.in-berlin.de, ruchandani.tina@gmail.com, chehabrafael@gmail.com, dan.carpenter@oracle.com, prabhakar.csengg@gmail.com, chris.j.arges@canonical.com, agoode@google.com, pierre-louis.bossart@linux.intel.com, gtmkramer@xs4all.nl, clemens@ladisch.de, daniel@zonque.org, vladcatoi@gmail.com, misterpib@gmail.com, damien@zamaudio.com, pmatilai@laiskiainen.org, takamichiho@gmail.com, normalperson@yhbt.net, bugzilla.frnkcg@spamgourmet.com, joe@oampo.co.uk, calcprogrammer1@gmail.com, jussi@sonarnerd.net, kyungmin.park@samsung.com, s.nawrocki@samsung.com, kgene@kernel.org, hyun.kwon@xilinx.com, michal.simek@xilinx.com, soren.brinkmann@xilinx.com, pawel@osciak.com, m.szyprowski@samsung.com, gregkh@linuxfoundation.org, skd08@gmail.com, nsekhar@ti.com, boris.brezillon@free-electrons.com, Julia.Lawall@lip6.fr, elfring@users.sourceforge.net, p.zabel@pengutronix.de, ricardo.ribalda@gmail.com Cc: Shuah Khan , linux-media@vger.kernel.org, alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org Subject: [PATCH v2 08/19] media: platform s3c-camif: Update graph_mutex to graph_lock spinlock Date: Wed, 22 Jul 2015 16:42:09 -0600 Message-Id: <8e89eac538be404ecf4ba6b3f1d202e9d989f3df.1437599281.git.shuahkh@osg.samsung.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1437604966; bh=M7rQ2FbsNBJ5cvge603Ui14negWQlqhB37FP+aU30Y4=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=bqtzhPZznMtYr/S9vUvrc7Pjsm7dj/teXhRtQhEC440gtUuPnLYHyRbRtJUulhkUi ++3rS1hG7Nl2QKYNv4eusashE0iJO/dmM0p/71sXAmjiDp6Nz9ZgqsfbAEWSm4Pda9 xsVLLvbxyak5pf2mBsyUlswwSfTDpsdMVxltWm/ED4Q3TMXetodAeBnZrSmX1bGYcU mExWfrZPpDhbOVv08+KGYTdXL4QbSWFxZ7bJ1ucGqo4aPB9cYrLTsMf3g3wv92V7wo EJiMjwqOHrxeBvIiuE0Izz3QkpyYtlHvlKvId4fzDmxiS5i+/c3qZVxI9Ag7Sa5FjD 7251QwFdkINeg== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Update graph_mutex to graph_lock spinlock to be in sync with the Media Conttroller change for the same. Signed-off-by: Shuah Khan --- drivers/media/platform/s3c-camif/camif-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c index f47b332..90dd781 100644 --- a/drivers/media/platform/s3c-camif/camif-core.c +++ b/drivers/media/platform/s3c-camif/camif-core.c @@ -495,7 +495,7 @@ static int s3c_camif_probe(struct platform_device *pdev) if (ret < 0) goto err_sens; - mutex_lock(&camif->media_dev.graph_mutex); + spin_lock(&camif->media_dev.graph_lock); ret = v4l2_device_register_subdev_nodes(&camif->v4l2_dev); if (ret < 0) @@ -509,12 +509,12 @@ static int s3c_camif_probe(struct platform_device *pdev) if (ret < 0) goto err_unlock; - mutex_unlock(&camif->media_dev.graph_mutex); + spin_unlock(&camif->media_dev.graph_lock); pm_runtime_put(dev); return 0; err_unlock: - mutex_unlock(&camif->media_dev.graph_mutex); + spin_unlock(&camif->media_dev.graph_lock); err_sens: v4l2_device_unregister(&camif->v4l2_dev); media_device_unregister(&camif->media_dev);