From patchwork Sun Aug 5 23:03:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 1275941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 2DCB93FC23 for ; Sun, 5 Aug 2012 23:09:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sy9uf-0007Jr-Tx; Sun, 05 Aug 2012 23:07:10 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sy9uc-0007C3-Db for linux-arm-kernel@lists.infradead.org; Sun, 05 Aug 2012 23:07:06 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq13so4890513pbb.36 for ; Sun, 05 Aug 2012 16:07:06 -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=flZmSH7nLRwRivetlJJQGebkkkUJt54twBJFzjp8ZCc=; b=jKGKO7ZGzuzdKx09tNLK4PQl708h4VV+zPNKarrvf6/zZz0RsP48N1YWMqvd0PMW3z lwIj5OCAOCLqTX1BIfqqXpKVqI/FYc+kZxVguGJ94/zGy2hr4hZ7z5kPpic+tqMZ9bPh IRSbFJn0ibPcUX7KAArTt8NyioMwzUSyeeWBSsei9k73qrIJ5uq+EjHaO1grugA65ilL K6uj79mhoufBoQOK4CY28gvM2Ogtr+WVdPPMvtga+HtNFHZWP9s5+o/ng+hmASr3hxoG rCme2N9MyuhdUNj3Qo/lJz4gJbQT55et0DISyVIhGsgz+XS+GQ03iWQmjF2HpJ2QfTAZ GDgg== Received: by 10.68.236.67 with SMTP id us3mr14444760pbc.80.1344208026104; Sun, 05 Aug 2012 16:07:06 -0700 (PDT) Received: from localhost (m9f0536d0.tmodns.net. [208.54.5.159]) by mx.google.com with ESMTPS id kh1sm7592067pbc.23.2012.08.05.16.06.53 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 16:07:05 -0700 (PDT) From: Anton Vorontsov To: Russell King Subject: [PATCH 3/9] [media] mx1_camera: Don't use {en,dis}able_fiq() calls Date: Sun, 5 Aug 2012 16:03:33 -0700 Message-Id: <1344207819-3415-3-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120805230238.GA1663@lizard> References: <20120805230238.GA1663@lizard> X-Gm-Message-State: ALoCoQnADOHv+M7XfjozkTF1KggTOghj0C7GJFqf1XPIJdu4Hc2TRsmfqfWTqbXJs+DiFUasfdoP 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.160.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/video/mx1_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index d2e6f82..1536d09 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/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);