From patchwork Fri Nov 23 00:49:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 13091 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 4E7D323E13 for ; Fri, 23 Nov 2012 00:53:37 +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 021BDA18BB3 for ; Fri, 23 Nov 2012 00:53:36 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1226114ieb.11 for ; Thu, 22 Nov 2012 16:53:36 -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=7yrhHnifAkG1nDuhFZMP7QYjg8klFb0QzWbPCHETaw4=; b=hctF6JFwUyqfDyRsQieEbHoBtTSaqH0TZd8+awnTtYFmeVpmFjVOshgBt4Q8feTBah IPreNcyTeHGm15NS8iBlC1BI2vMTi0TrStHP3XMcyh7+NLHILIUmpLOxfhUwXw+M00Lw BZUdC8pVWD4jf5Bq9LFeSAhwJcRkgQxkgeDS2MWg56cBKWM+ondzeJbf0raWnBo27wYu W5GCwvdmMNwi2YTSUVZj/w7gJ/Wjm/V+fYJYGqZ3BdTF6KMKhltuxasHUuhdFsd9llSn GdLYGeBmY1SGGPTxfn8JxALJqzggGW+doUTBuHlYd2wvzNuhsK6QD+w05XipMNI0VmoY Pa7w== Received: by 10.50.152.137 with SMTP id uy9mr2020796igb.62.1353632016791; Thu, 22 Nov 2012 16:53:36 -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 n20csp282390igt; Thu, 22 Nov 2012 16:53:36 -0800 (PST) Received: by 10.182.98.19 with SMTP id ee19mr1587625obb.90.1353632016109; Thu, 22 Nov 2012 16:53:36 -0800 (PST) Received: from mail-oa0-f46.google.com (mail-oa0-f46.google.com [209.85.219.46]) by mx.google.com with ESMTPS id ab5si4271862obc.116.2012.11.22.16.53.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:53:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.219.46 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.219.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.219.46 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-oa0-f46.google.com with SMTP id h16so9978719oag.33 for ; Thu, 22 Nov 2012 16:53:35 -0800 (PST) Received: by 10.182.162.4 with SMTP id xw4mr1674320obb.16.1353632015847; Thu, 22 Nov 2012 16:53:35 -0800 (PST) Received: from localhost (ip-64-134-239-153.public.wayport.net. [64.134.239.153]) by mx.google.com with ESMTPS id hg8sm4460722obb.19.2012.11.22.16.53.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:53:35 -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 04/10] ASoC: imx: Don't use {en,dis}able_fiq() calls Date: Thu, 22 Nov 2012 16:49:57 -0800 Message-Id: <1353631803-4853-4-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: ALoCoQmKNBx4LdeCQHGcPJHHQWGLmCqbDGfrgmrZ5Jj04pK80FbkFTtWXk/U4JiwgyHOkBTkMhg0 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 Acked-by: Mark Brown --- sound/soc/fsl/imx-pcm-fiq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c index 22c6130..8f1a4a6 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c @@ -139,7 +139,7 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) hrtimer_start(&iprtd->hrt, ns_to_ktime(iprtd->poll_time_ns), HRTIMER_MODE_REL); if (++fiq_enable == 1) - enable_fiq(imx_pcm_fiq); + enable_irq(imx_pcm_fiq); break; @@ -149,7 +149,7 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) atomic_set(&iprtd->running, 0); if (--fiq_enable == 0) - disable_fiq(imx_pcm_fiq); + disable_irq(imx_pcm_fiq); break; default: