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: 1596931 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 8E3A3DFB34 for ; Mon, 15 Oct 2012 21:57:11 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TNsd0-0008RC-BW; Mon, 15 Oct 2012 21:55:14 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TNscW-0008HX-OJ for linux-arm-kernel@lists.infradead.org; Mon, 15 Oct 2012 21:54:45 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi5so5498790pad.36 for ; Mon, 15 Oct 2012 14:54:44 -0700 (PDT) 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=MLp476MChLCyQ3CA7Yl0XeSVvy9HXiPZCC4ZtmrzPfw=; b=jp2TMYb6pb2q4G+ns+s6iwsHoRaVdntaucgnK9lICrlDXk5qX0rR7bckfYfNWzXwOn Hfg2f3jGRDGPpRIA17vNPoaiffiPLNh0NAZUlzsk0+tk8nySgV6yYnBH8L6Fcwn4+MLg xBLk0gzAKSD/47TkWchiXnapWJ0GThs7C7PuiJLIjt9XHyO3JAfJVxQbSZPd83wfWq0M 2ExJmbhrfCMym2g2tgdiSKO1ELgPGkDW7wtPt41eng5T4jPxK5LKo0UW05/rpkkHGi41 8Arv+kCkc4ADI9ldbkrdwpujjllMaXERHtrqYIVfXMge3DeEYIKF4fCsnMFdi+ozFmJR 7ylA== 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 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: ALoCoQn4tFhWNMWE+JZefjWf6jj0n7+fjUhXODViOqBbReswSCzeH+doSImn9rLVGsGvoxHiNcuS X-Spam-Note: CRM114 invocation failed 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.220.49 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, Sascha Hauer , patches@linaro.org, Tony Lindgren , Mark Brown , linux-kernel@vger.kernel.org, Kukjin Kim , John Stultz , Ben Dooks , kernel-team@android.com, Liam Girdwood , 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);