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: 10490 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 C363A24048 for ; Sun, 5 Aug 2012 23:07:07 +0000 (UTC) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8755AA18036 for ; Sun, 5 Aug 2012 23:07:07 +0000 (UTC) Received: by mail-ob0-f180.google.com with SMTP id uo19so4871224obb.11 for ; Sun, 05 Aug 2012 16:07:07 -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=flZmSH7nLRwRivetlJJQGebkkkUJt54twBJFzjp8ZCc=; b=XF94L/nYtVpkiLp4ODGd5j9Ge6W+akYNDfmahtM4P3Vhud+lw/A/YjMKZbBhoc46FB dArqKPR0zgwbvro/1OSv+XmnD5CyNiNvYzriZB04EDVCjOfc5dm1UyNpzaxuVSOIHVsf kzj4RruwA3KGZ+4AtJBwZjVUNpyZH+DpBtLX3iOF5EhOlqZHO0fClRKJ9iDbwcC558yb dxDsGikzEeWYBPVRsQRRSRzgGksdSjrJaPIE1KCKYO9v9E8HZ1shY99mM+iKCYx2VkwV 8gfSfZMZc2CEqtj4eTcbUqpQt6jdvDDsC/i2zadpDer1x/JgdgoVsykv+Qt7b7yQwiWM Ou3g== Received: by 10.50.94.166 with SMTP id dd6mr3863929igb.11.1344208026974; Sun, 05 Aug 2012 16:07:06 -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.87.40 with SMTP id u8csp412138igz; Sun, 5 Aug 2012 16:07:06 -0700 (PDT) Received: by 10.68.200.8 with SMTP id jo8mr14504336pbc.148.1344208026353; Sun, 05 Aug 2012 16:07:06 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id rd4si9439834pbc.190.2012.08.05.16.07.06 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 16:07:06 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.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-pb0-f50.google.com with SMTP id md12so3221727pbc.37 for ; Sun, 05 Aug 2012 16:07:06 -0700 (PDT) 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 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 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: ALoCoQk0Sc2EaIHNgNBRwY0YQtzsVi2g8cpKZNLMo+xQE6NXyDsQeSLbqVTiQ5X1iN21IFuBRqz9 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);