From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [1/3] ASoC: ti: remove compat dma probing From: Arnd Bergmann Message-Id: <20190307151646.1016966-1-arnd@arndb.de> Date: Thu, 7 Mar 2019 16:16:08 +0100 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 List-ID: QWZ0ZXIgcnVubmluZyBpbnRvIGEgbGluayBlcnJvcjoKCnNvdW5kL3NvYy90aS9lZG1hLXBjbS5v Oigucm9kYXRhKzB4MTgpOiB1bmRlZmluZWQgcmVmZXJlbmNlIHRvIGBlZG1hX2ZpbHRlcl9mbicK CkkgY2hlY2tlZCBhbGwgdXNlcnMgb2YgdGhpcywgYW5kIHRoZXkgaGF2ZSBuZXctc3R5bGUgJ2Rt YV9zbGF2ZV9tYXAnIHRhYmxlcywKc28gbm9uZSBvZiB0aGVtIHNob3VsZCBzdGlsbCBuZWVkIGl0 LiBSZW1vdmluZyB0aGUgYXNzb2NpYXRlZCBsaW5lcwpzaW1wbGlmaWVzIHRoZSBjb2RlIGFuZCBh dm9pZHMgdGhlIGJ1aWxkLXRpbWUgZGVwZW5kZW5jeSBvbiB0aGUKcmVzcGVjdGl2ZSBkbWFlbmdp bmUgZHJpdmVycy4KCkFja2VkLWJ5OiBQZXRlciBVamZhbHVzaSA8cGV0ZXIudWpmYWx1c2lAdGku Y29tPgpTaWduZWQtb2ZmLWJ5OiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgotLS0KdjI6 IHJlbW92ZSBoZWFkZXIgaW5jbHVzaW9ucyBhcyB3ZWxsCgpJIGFkZGVkIHRoZSB0d28gZG1hZW5n aW5lIHBhdGNoZXMgdG8gdGhlIHNlcmllcyB0aGlzIHRpbWUsIGJ1dAp3ZSBwcm9iYWJseSB3YW50 IHRvIGhhdmUgdGhvc2UgbWVyZ2VkIHNlcGFyYXRlbHkgdGhyb3VnaCB0aGUKZG1hZW5naW5lIHRy ZWUsIHdoaWxlIHRoaXMgb25lIHNob3VsZCBnZXQgbWVyZ2VkIGFzIGEgYnVnZml4CnRocm91Z2gg QVNvQy4KLS0tCiBzb3VuZC9zb2MvdGkvZWRtYS1wY20uYyB8IDUgKy0tLS0KIHNvdW5kL3NvYy90 aS9zZG1hLXBjbS5jIHwgOSArKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25z KCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zb3VuZC9zb2MvdGkvZWRtYS1wY20u YyBiL3NvdW5kL3NvYy90aS9lZG1hLXBjbS5jCmluZGV4IDU5ZTU4OGFiZTU0Yi4uZmRmZmI4MDFi MTg1IDEwMDY0NAotLS0gYS9zb3VuZC9zb2MvdGkvZWRtYS1wY20uYworKysgYi9zb3VuZC9zb2Mv dGkvZWRtYS1wY20uYwpAQCAtMjMsNyArMjMsNiBAQAogI2luY2x1ZGUgPHNvdW5kL3BjbV9wYXJh bXMuaD4KICNpbmNsdWRlIDxzb3VuZC9zb2MuaD4KICNpbmNsdWRlIDxzb3VuZC9kbWFlbmdpbmVf cGNtLmg+Ci0jaW5jbHVkZSA8bGludXgvZWRtYS5oPgogCiAjaW5jbHVkZSAiZWRtYS1wY20uaCIK IApAQCAtNDMsMTQgKzQyLDEyIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc25kX3BjbV9oYXJkd2Fy ZSBlZG1hX3BjbV9oYXJkd2FyZSA9IHsKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc25kX2RtYWVuZ2lu ZV9wY21fY29uZmlnIGVkbWFfZG1hZW5naW5lX3BjbV9jb25maWcgPSB7CiAJLnBjbV9oYXJkd2Fy ZSA9ICZlZG1hX3BjbV9oYXJkd2FyZSwKIAkucHJlcGFyZV9zbGF2ZV9jb25maWcgPSBzbmRfZG1h ZW5naW5lX3BjbV9wcmVwYXJlX3NsYXZlX2NvbmZpZywKLQkuY29tcGF0X2ZpbHRlcl9mbiA9IGVk bWFfZmlsdGVyX2ZuLAogCS5wcmVhbGxvY19idWZmZXJfc2l6ZSA9IDEyOCAqIDEwMjQsCiB9Owog CiBpbnQgZWRtYV9wY21fcGxhdGZvcm1fcmVnaXN0ZXIoc3RydWN0IGRldmljZSAqZGV2KQogewot CXJldHVybiBkZXZtX3NuZF9kbWFlbmdpbmVfcGNtX3JlZ2lzdGVyKGRldiwgJmVkbWFfZG1hZW5n aW5lX3BjbV9jb25maWcsCi0JCQkJCVNORF9ETUFFTkdJTkVfUENNX0ZMQUdfQ09NUEFUKTsKKwly ZXR1cm4gZGV2bV9zbmRfZG1hZW5naW5lX3BjbV9yZWdpc3RlcihkZXYsICZlZG1hX2RtYWVuZ2lu ZV9wY21fY29uZmlnLCAwKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGVkbWFfcGNtX3BsYXRmb3Jt X3JlZ2lzdGVyKTsKIApkaWZmIC0tZ2l0IGEvc291bmQvc29jL3RpL3NkbWEtcGNtLmMgYi9zb3Vu ZC9zb2MvdGkvc2RtYS1wY20uYwppbmRleCAyMWE5YzI0OTlkNDguLmEyMzYzNTBiZWIxMCAxMDA2 NDQKLS0tIGEvc291bmQvc29jL3RpL3NkbWEtcGNtLmMKKysrIGIvc291bmQvc29jL3RpL3NkbWEt cGNtLmMKQEAgLTExLDcgKzExLDYgQEAKICNpbmNsdWRlIDxzb3VuZC9wY21fcGFyYW1zLmg+CiAj aW5jbHVkZSA8c291bmQvc29jLmg+CiAjaW5jbHVkZSA8c291bmQvZG1hZW5naW5lX3BjbS5oPgot I2luY2x1ZGUgPGxpbnV4L29tYXAtZG1hZW5naW5lLmg+CiAKICNpbmNsdWRlICJzZG1hLXBjbS5o IgogCkBAIC0zMSw3ICszMCw2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc25kX3BjbV9oYXJkd2Fy ZSBzZG1hX3BjbV9oYXJkd2FyZSA9IHsKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc25kX2RtYWVuZ2lu ZV9wY21fY29uZmlnIHNkbWFfZG1hZW5naW5lX3BjbV9jb25maWcgPSB7CiAJLnBjbV9oYXJkd2Fy ZSA9ICZzZG1hX3BjbV9oYXJkd2FyZSwKIAkucHJlcGFyZV9zbGF2ZV9jb25maWcgPSBzbmRfZG1h ZW5naW5lX3BjbV9wcmVwYXJlX3NsYXZlX2NvbmZpZywKLQkuY29tcGF0X2ZpbHRlcl9mbiA9IG9t YXBfZG1hX2ZpbHRlcl9mbiwKIAkucHJlYWxsb2NfYnVmZmVyX3NpemUgPSAxMjggKiAxMDI0LAog fTsKIApAQCAtMzksMTMgKzM3LDEyIEBAIGludCBzZG1hX3BjbV9wbGF0Zm9ybV9yZWdpc3Rlcihz dHJ1Y3QgZGV2aWNlICpkZXYsCiAJCQkgICAgICAgY2hhciAqdHhkbWFjaGFuLCBjaGFyICpyeGRt YWNoYW4pCiB7CiAJc3RydWN0IHNuZF9kbWFlbmdpbmVfcGNtX2NvbmZpZyAqY29uZmlnOwotCXVu c2lnbmVkIGludCBmbGFncyA9IFNORF9ETUFFTkdJTkVfUENNX0ZMQUdfQ09NUEFUOworCXVuc2ln bmVkIGludCBmbGFncyA9IDA7CiAKIAkvKiBTdGFuZGFyZCBuYW1lcyBmb3IgdGhlIGRpcmVjdGlv bnM6ICd0eCcgYW5kICdyeCcgKi8KIAlpZiAoIXR4ZG1hY2hhbiAmJiAhcnhkbWFjaGFuKQogCQly ZXR1cm4gZGV2bV9zbmRfZG1hZW5naW5lX3BjbV9yZWdpc3RlcihkZXYsCi0JCQkJCQkmc2RtYV9k bWFlbmdpbmVfcGNtX2NvbmZpZywKLQkJCQkJCWZsYWdzKTsKKwkJCQkJCSZzZG1hX2RtYWVuZ2lu ZV9wY21fY29uZmlnLCAwKTsKIAogCWNvbmZpZyA9IGRldm1fa3phbGxvYyhkZXYsIHNpemVvZigq Y29uZmlnKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFjb25maWcpCkBAIC02NSw3ICs2Miw3IEBAIGlu dCBzZG1hX3BjbV9wbGF0Zm9ybV9yZWdpc3RlcihzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJY29uZmln LT5jaGFuX25hbWVzWzBdID0gdHhkbWFjaGFuOwogCWNvbmZpZy0+Y2hhbl9uYW1lc1sxXSA9IHJ4 ZG1hY2hhbjsKIAotCXJldHVybiBkZXZtX3NuZF9kbWFlbmdpbmVfcGNtX3JlZ2lzdGVyKGRldiwg Y29uZmlnLCBmbGFncyk7CisJcmV0dXJuIGRldm1fc25kX2RtYWVuZ2luZV9wY21fcmVnaXN0ZXIo ZGV2LCBjb25maWcsIDApOwogfQogRVhQT1JUX1NZTUJPTF9HUEwoc2RtYV9wY21fcGxhdGZvcm1f cmVnaXN0ZXIpOwogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 047C0C43381 for ; Thu, 7 Mar 2019 15:17:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2E6520840 for ; Thu, 7 Mar 2019 15:17:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726172AbfCGPRN (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 Content-Transfer-Encoding: 8bit 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) 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); -- 2.20.0