From patchwork Tue Apr 23 15:54:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2479681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id CB1B8DF2E5 for ; Tue, 23 Apr 2013 18:42:59 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfaX-0001KR-Iu; Tue, 23 Apr 2013 15:57:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfYR-0004Yo-6y; Tue, 23 Apr 2013 15:54:51 +0000 Received: from moutng.kundenserver.de ([212.227.17.8]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfYC-0004X0-Pz for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2013 15:54:38 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0LcTPG-1UtEr816yE-00k71z; Tue, 23 Apr 2013 17:54:32 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ASoC: don't call of_dma_request_slave_channel directly Date: Tue, 23 Apr 2013 17:54:33 +0200 Message-Id: <1366732475-479886-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366732475-479886-1-git-send-email-arnd@arndb.de> References: <1366732475-479886-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:qXvgaZqJ7+4H+hs7UJNsdz9ltFd22wa/iumv+5jQ+uN 9ROxaHacgfKeUyNQ+1gXSoH65jhDtcFxiQWX8Lmnkws79KeJVV jm1lmfg4pYxOrUuEGfC7rl/8jyO0CG8I9L22gpHkaphmrO+zOm fcxUGI7JthB3JT2RFww3vtghYExMLR/RPT4TVRf9YLN5LtBnh6 hEJYKFb16Pj3jdyXuADc2IMducWRZyzbZUuj+gPlGPg0914t9U uUYiJU+XHNa9CE2sfR7zx8u0KBltB+PHfI/Mcv5Wi+Dqf4RifZ FSNCKf2B9mqtlFxK5AxBH+OJPAHs4nJIdgtFmumqrZOQ2y/qeY lJHBnUeHUFbQh4zzr4oOdXajh4QhUceMzsDDODpcd X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130423_115437_155709_6E663C24 X-CRM114-Status: GOOD ( 11.35 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.8 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , Arnd Bergmann , Mark Brown , linux-kernel@vger.kernel.org, Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The exported interface for device drivers is dma_request_slave_channel, not of_dma_request_slave_channel. The former does not depend on device tree but also works with ACPI and other interfaces providing an abstraction for DMA channels. This fixes link errors when building ALSA as a loadable module. Signed-off-by: Arnd Bergmann Cc: alsa-devel@alsa-project.org Cc: Lars-Peter Clausen Cc: Shawn Guo Cc: Mark Brown --- sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 5fd5ed4..8ee9859 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -219,19 +219,20 @@ static const char * const dmaengine_pcm_dma_channel_names[] = { }; static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, - struct device_node *of_node) + struct device *dev) { unsigned int i; + struct device_node *of_node = dev->of_node; if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node) return; if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) { - pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx"); + pcm->chan[0] = dma_request_slave_channel(dev, "tx_rx"); pcm->chan[1] = pcm->chan[0]; } else { for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { - pcm->chan[i] = of_dma_request_slave_channel(of_node, + pcm->chan[i] = dma_request_slave_channel(dev, dmaengine_pcm_dma_channel_names[i]); } } @@ -255,7 +256,7 @@ int snd_dmaengine_pcm_register(struct device *dev, pcm->config = config; pcm->flags = flags; - dmaengine_pcm_request_chan_of(pcm, dev->of_node); + dmaengine_pcm_request_chan_of(pcm, dev); if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) return snd_soc_add_platform(dev, &pcm->platform,