From patchwork Mon Oct 15 21:51:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 12242 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 0698523EFB for ; Mon, 15 Oct 2012 21:54:49 +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 AD166A1861A for ; Mon, 15 Oct 2012 21:54:48 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so8462174iej.11 for ; Mon, 15 Oct 2012 14:54:48 -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=TU4sLOaP3ljAd26IA3J5iyeaj8zJKQAR8xsLbdvofOA=; b=QIN60CVTiOcE6NPwD7ng2+xN4g9qyf+XFnnTjwMBbD514iXCJz+ZRMAHetOpRhs8G7 MJvYWA0YYIQJkmPH282ouDcUjJ2+ngJ5BMC6l8D6rE6RN2d1pAp+/qT+ZFrVvDKFb2Ef 25CjU3dB36X+0kjZ4vFFbSU1VpJLPdcJQ6XR6MD/it+JQ9A04o+V4anSTkLNNrwlWPXq HsiYQ9oraz+5b0iMBVvD/ZSBGnupMtWC+4sY2TRFeDmGpdhg5WARtr6Cvfs6vx78bMu1 6vWt8TJ3lycGP/J4PDWciMZ5iNGikuHgva2+qzuTkYu25lBstuv5Q4W3nKaSM8vSrJUo 9HyQ== Received: by 10.50.161.169 with SMTP id xt9mr8499480igb.62.1350338088376; Mon, 15 Oct 2012 14:54:48 -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.67.148 with SMTP id n20csp641638igt; Mon, 15 Oct 2012 14:54:48 -0700 (PDT) Received: by 10.68.115.75 with SMTP id jm11mr40916217pbb.28.1350338087802; Mon, 15 Oct 2012 14:54:47 -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 iv8si24102935pbc.337.2012.10.15.14.54.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 14:54:47 -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 md4so5917726pbc.37 for ; Mon, 15 Oct 2012 14:54:47 -0700 (PDT) Received: by 10.66.80.133 with SMTP id r5mr10482159pax.24.1350338087584; Mon, 15 Oct 2012 14:54:47 -0700 (PDT) Received: from localhost (ip-64-134-230-8.public.wayport.net. [64.134.230.8]) by mx.google.com with ESMTPS id qf4sm9632093pbc.1.2012.10.15.14.54.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 14:54:47 -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 04/10] ASoC: imx: Don't use {en,dis}able_fiq() calls Date: Mon, 15 Oct 2012 14:51:28 -0700 Message-Id: <1350337894-9744-4-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: ALoCoQmyjqYSWQqpcHA/MPxi0qHlFvARC1jqYVGzXtDxopxOazQD5FKbMwwfYIUXYZ5ejIc+NHCe 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: Mark Brown Acked-by: Sascha Hauer --- 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: