From patchwork Fri Nov 23 00:49:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 1793341 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id EEE76DF24C for ; Fri, 23 Nov 2012 00:57:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbhWx-0006cX-Qn; Fri, 23 Nov 2012 00:54:08 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbhWP-0006TH-2O for linux-arm-kernel@lists.infradead.org; Fri, 23 Nov 2012 00:53:37 +0000 Received: by mail-ob0-f177.google.com with SMTP id eh20so8362162obb.36 for ; Thu, 22 Nov 2012 16:53:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=wtfb97Y/VlWRa8KT5Cz269FNm/sHUq5vMMVNZo+ik/c=; b=Y8bGvYbdt33D4PWeIua8jPPMGLFYFLgxLU5sOphst8avJNx0a2P+XbMsu0F92MGd1t QTiwUMeehZP6uozhzTfTrCWGTFmmxID3jTVGbUcStk5Davkc7GWWtO0P0QcxkgBQ5mzP ubb2W92CJJFcyoX5pzx1R8vI/r0JOku0YWhdhm0NTeK3lc5w3xjcWl07Kz4NxPZYoPS8 2desRIrx4nJCPZisi57KKYbu050wVykRHe7l1/j5unWpiFycXmeYSHOZltaXmv+I8eMV 0IrlqmHQcTpgjNOeSy9cMr2rgw6/pzfbMs9bCN2Aniyu0cJX7+sxr//rPhKf8aAbMIFc f1Cw== Received: by 10.182.21.135 with SMTP id v7mr1611877obe.101.1353632012887; Thu, 22 Nov 2012 16:53:32 -0800 (PST) Received: from localhost (ip-64-134-239-153.public.wayport.net. [64.134.239.153]) by mx.google.com with ESMTPS id c18sm4462776obc.17.2012.11.22.16.53.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:53:32 -0800 (PST) From: Anton Vorontsov To: Andrew Morton Subject: [PATCH 03/10] [media] mx1_camera: Don't use {en, dis}able_fiq() calls Date: Thu, 22 Nov 2012 16:49:56 -0800 Message-Id: <1353631803-4853-3-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.8.0 In-Reply-To: <20121123003849.GA973@lizard.mcd25758.sjc.wayport.net> References: <20121123003849.GA973@lizard.mcd25758.sjc.wayport.net> X-Gm-Message-State: ALoCoQlqqk0sru45EpEKMnJbmkOQq4Zdqq5LtxJQILuz0ggCeJJVoOiDU5nSyrwRRW+PGP7/Dq91 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_195333_223202_3D01B7B2 X-CRM114-Status: GOOD ( 11.93 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-kernel@lists.linaro.org, Russell King , patches@linaro.org, linux-kernel@vger.kernel.org, John Stultz , Jason Wessel , kernel-team@android.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The driver uses platform-specific mxc_set_irq_fiq() with the VIRQ cookie passed to it, so it's pretty clear that the driver is absolutely sure that the FIQ is routed via platform-specific IC, and that the cookie can be used to mask/unmask FIQs. So, let's switch to the genirq routines, since we're about to remove FIQ-specific variants. Signed-off-by: Anton Vorontsov Acked-by: Sascha Hauer --- drivers/media/platform/soc_camera/mx1_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/soc_camera/mx1_camera.c b/drivers/media/platform/soc_camera/mx1_camera.c index bbe7099..4855a46 100644 --- a/drivers/media/platform/soc_camera/mx1_camera.c +++ b/drivers/media/platform/soc_camera/mx1_camera.c @@ -801,7 +801,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) set_fiq_regs(®s); mxc_set_irq_fiq(irq, 1); - enable_fiq(irq); + enable_irq(irq); pcdev->soc_host.drv_name = DRIVER_NAME; pcdev->soc_host.ops = &mx1_soc_camera_host_ops; @@ -817,7 +817,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) return 0; exit_free_irq: - disable_fiq(irq); + disable_irq(irq); mxc_set_irq_fiq(irq, 0); release_fiq(&fh); exit_free_dma: @@ -842,7 +842,7 @@ static int __exit mx1_camera_remove(struct platform_device *pdev) struct resource *res; imx_dma_free(pcdev->dma_chan); - disable_fiq(pcdev->irq); + disable_irq(pcdev->irq); mxc_set_irq_fiq(pcdev->irq, 0); release_fiq(&fh);