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: 159859 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7553325jad; Thu, 7 Mar 2019 07:17:13 -0800 (PST) X-Google-Smtp-Source: APXvYqzNy+0SINzGK7eI5oLbdUBnAaWJsGnSK+8w51yAboA3MwU8upgy5OzytYoxCotN64Zru12f X-Received: by 2002:a63:591f:: with SMTP id n31mr11707488pgb.304.1551971833644; Thu, 07 Mar 2019 07:17:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551971833; cv=none; d=google.com; s=arc-20160816; b=tx3rrLFxg3knqLX1vhf/BbqVoUBiXoArHs0f8rxX1VYN74hCwD61p5/ZW95gEMZQo9 XsRRLGqeSyEaM8uieI6IhKA7FHOjKGuKBEA3uKdKJNIf84SsFwqd1wCWY+MrYnkt5fEO LOk9q1YalGDk0mc1d4WQz/demBO2iBa84GB0lFn/C2k6TJldl63Ilb8UIPfpt9dJQEOA zRXA69ig4GF0hs2c9MKorXShpRQqlhZ1SP01pwN2zUPUBseNZEuSRGz6NSstWAGA5n5/ GCC/szGluMTGB3LsFD/kFuyhGcqmHTAoe1sLk6kKkUbrqUdn52pKJrqbh1BRiONrp/z0 7kEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=oy+nrjh+KXnWuLUFHjMWGKyBI09/JxDxyoJ2f7Rv9Hw=; b=gNEkmHPoz1F0ys4nCuGk1TjFqnf8fsPOleBarewILsj1bYBIA6b+HEad15Pu21b0Cp U0CQC4pQoiq6wHQk4yv2sq1M6/tYZ/ZxanTpEQFz33oIMIk1Qnz6FfCPdEoVcpkq+Rke 8xSjkMeYEONbmPEVRoihGPdeziduchEXND3oUx9uv0MU6xtKlsOcob22M8FuhdBXABDa X50uMzA/bHZb+h3heesTInvzJ8j9mQa6FsHg/YBoPfSzA4kKXivhWhsLc9j8sai/GsI6 yyHqxGFz2VBSdlxFygMhN7/KA25q+WatnfUVHjwUQbSebL81rEe8Cur/2MzT5lpG2sap GDBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=dmaengine-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba5si4305630plb.186.2019.03.07.07.17.13; Thu, 07 Mar 2019 07:17:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=dmaengine-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726410AbfCGPRN (ORCPT + 3 others); 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-Spam-Flag: NO 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: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org 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(-) -- 2.20.0 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);