From patchwork Mon Oct 15 21:51:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 12241 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6846C23EFB for ; Mon, 15 Oct 2012 21:54:46 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id F1C6DA1861A for ; Mon, 15 Oct 2012 21:54:45 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so8462174iej.11 for ; Mon, 15 Oct 2012 14:54:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=MLp476MChLCyQ3CA7Yl0XeSVvy9HXiPZCC4ZtmrzPfw=; b=HKHNJ3AJVnJVh70/z1KPW+9ZquiBYG8XVOrioPydusYYZ/ujA5xddw+lflbDPX9ZBD EEaD0SYp/it3TSxEmOPt124aLit/ZPBOI0Hu/20G7JJFirSZUJLRpD8znumgcm8h/1sK Kq4EKPM02jcMaYCPdcJ0yB0xN4HK7e3U/jQslmpi/tuS4eLiTlhwhRUIELH4P+qNGdGB aSdodEvWkr89jqBmZPH5j9ZqiayAmPZVy2Ym2lKnPv8wCou81EtN4FsYwdpi6/RSWArP Q2d9fNlAtDHvuGFxTWrKIio3iozotgrAMh0hX3/1dN6GHdICpYeJy34yAFGZEADeRUOd LrBg== Received: by 10.50.168.37 with SMTP id zt5mr10005935igb.57.1350338085436; Mon, 15 Oct 2012 14:54:45 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp641632igt; Mon, 15 Oct 2012 14:54:45 -0700 (PDT) Received: by 10.68.135.234 with SMTP id pv10mr40604143pbb.156.1350338084850; Mon, 15 Oct 2012 14:54:44 -0700 (PDT) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by mx.google.com with ESMTPS id o10si23715875paw.209.2012.10.15.14.54.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 14:54:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.220.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-pa0-f50.google.com with SMTP id hz11so5827789pad.37 for ; Mon, 15 Oct 2012 14:54:44 -0700 (PDT) Received: by 10.68.217.67 with SMTP id ow3mr41281456pbc.26.1350338084349; Mon, 15 Oct 2012 14:54:44 -0700 (PDT) Received: from localhost (ip-64-134-230-8.public.wayport.net. [64.134.230.8]) by mx.google.com with ESMTPS id qn1sm9620951pbc.55.2012.10.15.14.54.42 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 14:54:43 -0700 (PDT) From: Anton Vorontsov To: Russell King Cc: John Stultz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com, Ben Dooks , Kukjin Kim , Sascha Hauer , Tony Lindgren , Mark Brown , Liam Girdwood Subject: [PATCH 03/10] [media] mx1_camera: Don't use {en, dis}able_fiq() calls Date: Mon, 15 Oct 2012 14:51:27 -0700 Message-Id: <1350337894-9744-3-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.12.3 In-Reply-To: <20121015214954.GA3352@lizard> References: <20121015214954.GA3352@lizard> X-Gm-Message-State: ALoCoQlUtoI50omeDWbL76p91OcQCpuoZNnHfI0cVPEYgMD1Gh3Uu7pNNKCxxdPIPNPZPFJQWfFO 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);