From patchwork Sun Aug 5 23:03:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 10491 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 428DC24048 for ; Sun, 5 Aug 2012 23:07:41 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0B03DA18036 for ; Sun, 5 Aug 2012 23:07:40 +0000 (UTC) Received: by yenq6 with SMTP id q6so1998315yen.11 for ; Sun, 05 Aug 2012 16:07:40 -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=ElONC4JZlrY+Wi6Z661llU//fYaXxDq5T9lbfg8w2Bc=; b=NkGW/3ecUvhc+bTb57I3Lmgh6ZQ8dP3k3dKd3V8+SioG32mvs6GFqUWJ/lEf6M/N4X OVHWtGYGMbfEjbHqcjRc97yaZHdQjbf0VQ9IyiUmtrlGVSFNOyzno3+xSi4UOWX0ELcN Rvw+S8EBxE9tXxdCb8h0Wx5Ft1gjmfrPWwBE2UAlrL0iaPrD9KTcIFnUuyHmz1mGfCn1 z5rbzS+0hPAWZuRT+/Yp3vAtPURBs/gGewU0EvvxFfoYAJEuivCXmgjDVUufJWRKI9Os gZxNDINRMxVA7KvHQvh3+0ODWjDgJLRHYoKV7KySpeSfuv8aA/ZHI4hGqCKv8n5XEAa4 Ccbw== Received: by 10.43.46.194 with SMTP id up2mr7834419icb.22.1344208060129; Sun, 05 Aug 2012 16:07:40 -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 u8csp412150igz; Sun, 5 Aug 2012 16:07:39 -0700 (PDT) Received: by 10.68.219.162 with SMTP id pp2mr14517022pbc.85.1344208059526; Sun, 05 Aug 2012 16:07:39 -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.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 16:07:39 -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:39 -0700 (PDT) Received: by 10.68.221.106 with SMTP id qd10mr14746029pbc.42.1344208059290; Sun, 05 Aug 2012 16:07:39 -0700 (PDT) Received: from localhost (m9f0536d0.tmodns.net. [208.54.5.159]) by mx.google.com with ESMTPS id qt6sm648619pbb.9.2012.08.05.16.07.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 16:07:38 -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 4/9] ASoC: imx: Don't use {en,dis}able_fiq() calls Date: Sun, 5 Aug 2012 16:03:34 -0700 Message-Id: <1344207819-3415-4-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: ALoCoQm7tV1Ng4VdlqpbDo8hRvqHQ+2nIRdFeSficGe/FA+yRZQHi+MJTLoq8cUjKKazcjA0f7XE 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 --- 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 ee27ba3..993e37d 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: