From patchwork Thu Mar 7 15:16:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10843143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD1CE1823 for ; Thu, 7 Mar 2019 15:17:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE4D12F33F for ; Thu, 7 Mar 2019 15:17:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C23C92F345; Thu, 7 Mar 2019 15:17:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 635502F33F for ; Thu, 7 Mar 2019 15:17:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726419AbfCGPRN (ORCPT ); Thu, 7 Mar 2019 10:17:13 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:48435 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbfCGPRM (ORCPT ); Thu, 7 Mar 2019 10:17:12 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MWz4j-1hYf5t0yZF-00XHZY; Thu, 07 Mar 2019 16:16:56 +0100 From: Arnd Bergmann To: Mark Brown Cc: Peter Ujfalusi , dmaengine@vger.kernel.org, Vinod Koul , alsa-devel@alsa-project.org, Arnd Bergmann , Liam Girdwood , Jarkko Nikula , Tony Lindgren , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 1/3] ASoC: ti: remove compat dma probing Date: Thu, 7 Mar 2019 16:16:08 +0100 Message-Id: <20190307151646.1016966-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:IDAzRVFsZyLsEwWH6SxwekAejlCMqtnGRLZja5hBLGl3fy91UZa Ku1wtdkzNmOj25OsZ8M/wQN/zRq0wthhXe0g9UMSDa4g33G3UWXsBzIlq0IBc91aLOFOKNZ 8w1Py5tly5egyXEWbxD8e+FsXmgD4PIlTDlliZ+CP8Z11bllYWGCFYEO0l0e267Vkh0Iula pxDdYoP2fqc2xt7rXmEsg== X-UI-Out-Filterresults: notjunk:1;V03:K0:M6MD7ZxYHGE=:bFMuDkQiJcwoYAAjJf9rlq LEcGnWy5knLhAvmsgWQiNVCRg2P/EXmHVtOW++5MhJEbz+RETAgrKuVhI9zrIy1c5H8JXuNYq jsDtUCByH6pGE+6D4FGuXuI8+z8LZ9J83fG7I99CTLTbqjD25O5u28hDK0WhVshzjfMM4ls3A FBRW6by33cCfNh67/mT+pn92rsJEC7nuHd4P/Yc7YnE01B+yvaqpogc4dw5v6qgl87mAI3/mt KTRgZ/81bUVb2xgEBlRfmG3eiqp+oJzEkjnML9WQgrt6CanIBLIBOMvNPYQJuOkgp8fZoTyj/ InbFGuYuoXSzYn318WngfaDDUeBAtTJOqWQtynotg8ROQfleDOxKf25E7ds6DU4wT2l4+SM3c sNCjEM+G49yq1IdRSHhAGK7qt48Ch/milKzFWu/h7XrsMYQBELR7WpQDIaC+gfAJ5lOBzFj5p UwS00++2v+BOFXQJLnZY8MeatlSe41AK4H9jZjZ0g95OpPEC9lTecBAo5fxV+LBYDDSbnGvfH rao68/PzhZF4WVaztUU+qje2QLwK5HwJH5631XDqO9nZTkxhoKwukC/HZfEUpMMUqXX1pljgK 0GAopM2XXTWbRQpgjv2/XCYCmlM5wI12VVYD9hsIGEqMd/RoA+901vmdIpJyK5ondAyaRFtmq Dcee8EvDTxDIPF/e8eoRsPY5LaMO9E/hTpvu9B1rrhsPuoc3ipZkQJ09WCn0p+TYwpLB6pviE vlkXD1bkP3TIcaJK7vos7jJOWedAJxLvJv3Hsg== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After running into a link error: sound/soc/ti/edma-pcm.o:(.rodata+0x18): undefined reference to `edma_filter_fn' I checked all users of this, and they have new-style 'dma_slave_map' tables, so none of them should still need it. Removing the associated lines simplifies the code and avoids the build-time dependency on the respective dmaengine drivers. Acked-by: Peter Ujfalusi Signed-off-by: Arnd Bergmann --- v2: remove header inclusions as well I added the two dmaengine patches to the series this time, but we probably want to have those merged separately through the dmaengine tree, while this one should get merged as a bugfix through ASoC. --- sound/soc/ti/edma-pcm.c | 5 +---- sound/soc/ti/sdma-pcm.c | 9 +++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/soc/ti/edma-pcm.c b/sound/soc/ti/edma-pcm.c index 59e588abe54b..fdffb801b185 100644 --- a/sound/soc/ti/edma-pcm.c +++ b/sound/soc/ti/edma-pcm.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "edma-pcm.h" @@ -43,14 +42,12 @@ static const struct snd_pcm_hardware edma_pcm_hardware = { static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { .pcm_hardware = &edma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = edma_filter_fn, .prealloc_buffer_size = 128 * 1024, }; int edma_pcm_platform_register(struct device *dev) { - return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_COMPAT); + return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, 0); } EXPORT_SYMBOL_GPL(edma_pcm_platform_register); diff --git a/sound/soc/ti/sdma-pcm.c b/sound/soc/ti/sdma-pcm.c index 21a9c2499d48..a236350beb10 100644 --- a/sound/soc/ti/sdma-pcm.c +++ b/sound/soc/ti/sdma-pcm.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "sdma-pcm.h" @@ -31,7 +30,6 @@ static const struct snd_pcm_hardware sdma_pcm_hardware = { static const struct snd_dmaengine_pcm_config sdma_dmaengine_pcm_config = { .pcm_hardware = &sdma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = omap_dma_filter_fn, .prealloc_buffer_size = 128 * 1024, }; @@ -39,13 +37,12 @@ int sdma_pcm_platform_register(struct device *dev, char *txdmachan, char *rxdmachan) { struct snd_dmaengine_pcm_config *config; - unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT; + unsigned int flags = 0; /* Standard names for the directions: 'tx' and 'rx' */ if (!txdmachan && !rxdmachan) return devm_snd_dmaengine_pcm_register(dev, - &sdma_dmaengine_pcm_config, - flags); + &sdma_dmaengine_pcm_config, 0); config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL); if (!config) @@ -65,7 +62,7 @@ int sdma_pcm_platform_register(struct device *dev, config->chan_names[0] = txdmachan; config->chan_names[1] = rxdmachan; - return devm_snd_dmaengine_pcm_register(dev, config, flags); + return devm_snd_dmaengine_pcm_register(dev, config, 0); } EXPORT_SYMBOL_GPL(sdma_pcm_platform_register);