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: 13090 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 4DED823E13 for ; Fri, 23 Nov 2012 00:53:34 +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 F2806A18BB3 for ; Fri, 23 Nov 2012 00:53:33 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1226114ieb.11 for ; Thu, 22 Nov 2012 16:53:33 -0800 (PST) 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=wtfb97Y/VlWRa8KT5Cz269FNm/sHUq5vMMVNZo+ik/c=; b=fBAHvuE8VrWsXd96FelR5d3Oupb0Op9cv2PDZdbeEI1mESEQg7SivvQixoEgbSiifa z79y4GkAAn21r2nOzaYP9NW8yb6RwZJsZtWPaKNvVdAEeNcssP3YN+wqdlwXzMEaJ+n1 y7cNrj/tUfatQmxnM/0E1tHmRdmIldNOGNX0p4gWdREwhnm13pnF97GNtFzBxbo9feEA U9Q8KPwvTfZ+XwpGp1seumEY+b69mp9UldS6VS6VHCyK9GafcO1xhutj+pOl6+qA/pPl p+cCp7QXdbwFcQ/W/6Z4h+h8WHZZoRdgR5Q7pzpL8khwlv99I8Q1XEgDth4dCEPCIqr4 AR7A== Received: by 10.50.186.199 with SMTP id fm7mr2011288igc.62.1353632013745; Thu, 22 Nov 2012 16:53:33 -0800 (PST) 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 n20csp282384igt; Thu, 22 Nov 2012 16:53:33 -0800 (PST) Received: by 10.182.124.102 with SMTP id mh6mr1625342obb.48.1353632013160; Thu, 22 Nov 2012 16:53:33 -0800 (PST) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by mx.google.com with ESMTPS id ab5si4296308obc.44.2012.11.22.16.53.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:53:33 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.181 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.214.181; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.181 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-ob0-f181.google.com with SMTP id za17so6441121obc.40 for ; Thu, 22 Nov 2012 16:53:33 -0800 (PST) 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 Cc: Russell King , Jason Wessel , 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 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: ALoCoQnYOiaw9xeDoSSOVqTOCSokrFMahB7Ni6PH/50qOHC3TETNQ5RfuiHTCDo91nVhplIWrPMP 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);