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); From patchwork Thu Mar 7 15:16:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 159860 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7554120jad; Thu, 7 Mar 2019 07:17:57 -0800 (PST) X-Google-Smtp-Source: APXvYqydlov7gIQaqS+EkHI4dGTpYy+Df/dswoG45PDGm1iGubJ7suwUNR/A3L2OXHB+FPDSSIJ0 X-Received: by 2002:a17:902:501:: with SMTP id 1mr13217242plf.72.1551971877581; Thu, 07 Mar 2019 07:17:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551971877; cv=none; d=google.com; s=arc-20160816; b=IQIjg8PCrlUg5gLsFzLfxwKoc0DcWWCErPPoBrwoMQ9S18b/8seQFzlliUt1eXBr2t Aggy8/87+JaI5cMusBDfJT4eEab7olQmHgvNqv1NtDtwEQp3jlv+w0jIEPjc5PUk54TG UtB0R6Zos5+U7l5pOMVcOvXIekLNk4dmEP5BvBQRu/poFspCOmTNaAiNoGJEV0DjDnIh jmkROzWOQfUMz8rFwoqea11U/SJECcmEjgyDV3kEFWpbZmtAEdWZ/mOl8hh6ClhNeT5f UjGr6i2Xj1MCM5+GE/vng8u62KWQk6nVOCFG1bJHxzgKVmIQ9ffLCdK7NzgrWZg4UhIo WZIw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=btEMXislUN5l9BVPWY9vFFDjY9T4jOPnXqP4oLNNxps=; b=YPjXeuleGTCdB8VNf/yzkFlh9TmCYir+q4ir9lvTAKJwcUNa/9b7Ze3tmtQrEdhYkM S0QNRhPmreCVOvpmBa624bJKFGgDPrZJXknkbucCB6bR+bhxvxO9Ief/NpBD8KOen/Yj 8ZMMWALQAgqZiNmAoGhVBZvQ2F6mHSZj0B8wsWoq2e5j6kUpexQ5oVY/yKBM4fuqMG8p 7LYKNUOPTz9e/aNMQGcWbJqCuON1YIZDnCN2eByT56aexNkWGGFa0mKj661XpgRLuvzo MW9XAgOfyiBm1SPb6QBFx3ik5CTYHLhvV6Vj6SU3Fx/upAD4ZRswZ9z0fsZrFtmjmKCL lN2Q== 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 33si4650545plg.3.2019.03.07.07.17.57; Thu, 07 Mar 2019 07:17:57 -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 S1726375AbfCGPR5 (ORCPT + 3 others); Thu, 7 Mar 2019 10:17:57 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:60511 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbfCGPR5 (ORCPT ); Thu, 7 Mar 2019 10:17:57 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MsrV2-1gmjPT1ofQ-00tC3t; Thu, 07 Mar 2019 16:17:43 +0100 From: Arnd Bergmann To: Mark Brown , Vinod Koul , Peter Ujfalusi , Arnd Bergmann , Janusz Krzysztofik Cc: dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, Dan Williams , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] dmaengine: omap-dma: make omap_dma_filter_fn private Date: Thu, 7 Mar 2019 16:16:09 +0100 Message-Id: <20190307151646.1016966-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190307151646.1016966-1-arnd@arndb.de> References: <20190307151646.1016966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:nBbEoXNunGoswjO+f6BrSVCztX4BCUBg4VQTJBpJ7EeSO7fsZXx kNFmU0I1zJ5hxjK4o1FHlEMQdpNk64xMCjDIMEF1fhfC0kMXml3sb49g7VP9bnB2nBv8d7U UYa3QGirbDMn6j/79M8MImQmWPNkjJTIpqQH7D3jx3KC64plLm6W3UhVnVISDubTDQ98vux SLHiWEhM+t+c3eeCAeURQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:y06xl6dcahY=:sqNdPImkh60jq2Io1jTQaE Q1uJA7aCyc7bndqCPSvIn9RPP07LjpSVx2ObrG6d7zAQuiN5/1V9pUlNBfapZfArzwnWV2sQr 1X2/LZyw9wFWN0VNJq6pG/uC4UUiUhwkY5rKbvxl+6+j0O0RxgtwtaM6OItdwAyxstTuow3dN qb2srxf21m60+9Bb9LiuNt9BPKDIVMo4xUl6ZG9OuSlzoVubTfh4SmHEFPGATmXOvFDWDCXvG XGVzAbVdgueHhYqaa83QNAoMRV8AxxgxXojuvkADnNuDRJOUlGJAyIRi9DaB413HHksXYZ/M5 ALXvG2onR1hGS0RKR5boxrJcat4NhSIQhtpcJKL+ijD/pFpb2/B7HRo88my0q2xz7IrOxdOEf Zsa2OYUNOqGB72wSqiwXnhX17vtYcfW/EUOF/3cQJ3JFru7bfsJHUZudkWrNocrekUX1obgGw 9khgtP8C+SUCtz2iANYotczknpJe5DEGJZYflYwT5zxQ1egL9q/NQE/r2lDQ3eWZUwmr5PXPR HqKuX+ni3ljwstdNJC4hAFODQ86tbGdsiGgNAuTt2iGseItoonaZ6N4+wVymR/WZYBDZwOHz4 v0LNC+GjfKqn4MRWAdAfYqDjL01wyqbU5U9lsoMgaNNrYGdm0jik9rcDyZBzkyGSTerzpGNos jZHYw00bWGzqlpefXYgXuXv45TJJmn8ASLWLNINQLhIvV67feM9Jv5AqxIgq+i1Co5an/LlTy 3qTfxq4NmFlW+4qYvcslPgxozNS24wqUIFtxWg== Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org With the audio driver no longer referring to this function, it can be made private to the dmaengine driver itself, and the header file removed. Signed-off-by: Arnd Bergmann --- drivers/dma/ti/omap-dma.c | 3 ++- include/linux/omap-dma.h | 2 -- include/linux/omap-dmaengine.h | 21 --------------------- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 include/linux/omap-dmaengine.h -- 2.20.0 Acked-by: Peter Ujfalusi diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index a4a931ddf6f6..5bf635ba234d 100644 --- a/drivers/dma/ti/omap-dma.c +++ b/drivers/dma/ti/omap-dma.c @@ -205,6 +205,7 @@ static const unsigned es_bytes[] = { [CSDP_DATA_TYPE_32] = 4, }; +static bool omap_dma_filter_fn(struct dma_chan *chan, void *param); static struct of_dma_filter_info omap_dma_info = { .filter_fn = omap_dma_filter_fn, }; @@ -1640,7 +1641,7 @@ static struct platform_driver omap_dma_driver = { }, }; -bool omap_dma_filter_fn(struct dma_chan *chan, void *param) +static bool omap_dma_filter_fn(struct dma_chan *chan, void *param) { if (chan->device->dev->driver == &omap_dma_driver.driver) { struct omap_dmadev *od = to_omap_dma_dev(chan->device); diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index 840ce551e773..ba3cfbb52312 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.h @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __LINUX_OMAP_DMA_H #define __LINUX_OMAP_DMA_H -#include - /* * Legacy OMAP DMA handling defines and functions * diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h deleted file mode 100644 index 8e6906c72e90..000000000000 --- a/include/linux/omap-dmaengine.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * OMAP DMA Engine support - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef __LINUX_OMAP_DMAENGINE_H -#define __LINUX_OMAP_DMAENGINE_H - -struct dma_chan; - -#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE)) -bool omap_dma_filter_fn(struct dma_chan *, void *); -#else -static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d) -{ - return false; -} -#endif -#endif /* __LINUX_OMAP_DMAENGINE_H */ From patchwork Thu Mar 7 15:16:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 159861 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7554610jad; Thu, 7 Mar 2019 07:18:22 -0800 (PST) X-Google-Smtp-Source: APXvYqxrzZNg98pEYaIdlReb/5Wiqxg3ezYEYJq96liNagL6D4r/hbIy+3y5kWfwrX48Xkkn87Bp X-Received: by 2002:a17:902:4c08:: with SMTP id a8mr13558984ple.294.1551971902271; Thu, 07 Mar 2019 07:18:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551971902; cv=none; d=google.com; s=arc-20160816; b=auMFAuZrwUYYOwFddutYqAmODEmMvFsVgLNKZzbJrnjOjZne2WE2l6P/eOxp+Z4fyf wCrRwrsOBwXqI8DNi5fpOCCEBqTICQmcpxOBwA49zFDPSbzV2NbKxVdfq6Pz06VMKYdF Y+2DO3QPuF7Z/ssx6wirC5w4WlHX/Je+z9DEb75OrmH7UQ4P5I2mBHM/zI1jXj/ULkqV i5Xc9NGphRuWw1Sl6L1UROpHJ2hP48P+GE0qs9vi17fvHtw7+vg9hYwaXzFSCqqZi5QK z4pNFTpa36cDM353fcA2qdjlzwC8AutLSRt7BJjeyP6la9wxxTKRStYDCq0ztLp2FI1u Q5hg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=S5kRkSPOsYa2TW2M2qx0ffV59aQ70NmY4zr3Q1HVLbo=; b=s8fa7VdawCHcOVsAK+cylR62fEZBWV1O5foCn3rfsGHYvxP7EqiTIw9SEccDyDjHk9 TknHrxO5DcnyKtNdUr7ZdZedq+kEvJIvoJcxxCWKrvK48cWJGYJvvEtlvGGnbcNkaT1U Kikci1T1ftM41sHWgDkLhpqw2tQsmU1Y3Jd/0JHdvau8svnwW+HA+wl2EHC+oGOUraT9 ZzzxjxR9O7BxZ/HBi5JTYuNhsKObyA3bd5qtoFRy+sZHpxxMWjoxAWXP7+//T8sWf41E jJZhg4n1zcaU7D9y21WGbVudFdeM7vBST2mprqM0kobAYrzlbucQvWO3DUnBlf+rTfBl cfJQ== 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 d16si4029171pgv.70.2019.03.07.07.18.21; Thu, 07 Mar 2019 07:18:22 -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 S1726337AbfCGPSV (ORCPT + 3 others); Thu, 7 Mar 2019 10:18:21 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:37207 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbfCGPSV (ORCPT ); Thu, 7 Mar 2019 10:18:21 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MHVWT-1hEmwK0EGP-00DXlI; Thu, 07 Mar 2019 16:18:09 +0100 From: Arnd Bergmann To: Mark Brown , Vinod Koul , Peter Ujfalusi , Arnd Bergmann Cc: dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, Dan Williams , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] dmaengine: edma: make edma_filter_fn private Date: Thu, 7 Mar 2019 16:16:10 +0100 Message-Id: <20190307151646.1016966-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190307151646.1016966-1-arnd@arndb.de> References: <20190307151646.1016966-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:hu6jPXZ5aq6eAOti9DqkxbzZf58m3D7/bSUI/OESUJyxDYdXcC1 1PyZfLdpIZ++HXYUuK2hzEpggwEfovdn1roh5unXNA86Y8FYVaZ4+X6uxB8fGNHdDAgMzvx 6eQeVxIFItZfL/pVK5ablekSSj6MYg/5vkCiB/1q5J25EeL3LmrWsP6HVVkgi1maIi1XIAI Ipl0iz7Cd6c8G073UwdRg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:oviKULBfuMc=:IZPP5yT4s6FPvDomebYYU7 tJMiL92a4EYtCer+0La2UBUHUA/JDDFFluhUG5SFFWiCf0eI2shYxDCtUpPJ8hmMHQiUg6epP 4Geol+KhIof0wa9qhk7QINUU+F2hqIrj/7HME46tbTKdtyKK6/V+531Yhkgr9KMYYDyy8Mdmu 9LtWuGNrNIG3HF6tNRbm7ugwy+CdegbCyEstaqnIRD4CAXcXnWPIsOEZaPY0+fVKqVEBRf65P QxmBo6AlRDIRfbt+2uHw6yYLq6dPeyGHVdGnlr23pA2D6ByJ9RgI+FYfAAtHRXz/jwrUotGrD qVDxqKxjG35K44hxxLJ5FH2ozAIY4jxSbh2JjrpWE5Jf8qvTyewNMr3WH0swaYT5UGsuOD54E /9aWFg0wnDDuJifOQUTlx9A1P9SZKslreiXuKfS+nu3Dq97dI0mst8NO0E7nVxJUTmLqBW60q BVma00uSs4aJce8rxIM0zhu4EwT3xTjM0clbjiI3u1TBsA30wxoHmaX8ajI5cnifQmNY07soN C8KWhDfIiSt1GI+by9pYZX63BTU+9MNU9uWCLlPpRRVlZW0CRy9qypnnL2N4FwpAZUj2KIFmW wyWLuol+A+QM9mZdhAjGUaxQE4jI3Brq//pxNCTnk62tH3lcc8Nts3jfhFH6NTVLSyrdtXijt QIQcFDRIC/Owb7FGaXGesfyNmGIA8jAByg5Mh69YzY8P2OpUvFSHd5j/iz2Ao7VK5cP+MVbkV RmMIKqWPHl0rpA7y3EHvgZadifoOL4OzjtZg5w== Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org With the audio driver no longer referring to this function, it can be made private to the dmaengine driver itself, and the header file removed. Signed-off-by: Arnd Bergmann --- drivers/dma/ti/edma.c | 5 +++-- include/linux/edma.h | 29 ----------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 include/linux/edma.h -- 2.20.0 diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c index ceabdea40ae0..f2549ee3fb49 100644 --- a/drivers/dma/ti/edma.c +++ b/drivers/dma/ti/edma.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include @@ -2185,6 +2184,8 @@ static struct dma_chan *of_edma_xlate(struct of_phandle_args *dma_spec, } #endif +static bool edma_filter_fn(struct dma_chan *chan, void *param); + static int edma_probe(struct platform_device *pdev) { struct edma_soc_info *info = pdev->dev.platform_data; @@ -2524,7 +2525,7 @@ static struct platform_driver edma_tptc_driver = { }, }; -bool edma_filter_fn(struct dma_chan *chan, void *param) +static bool edma_filter_fn(struct dma_chan *chan, void *param) { bool match = false; diff --git a/include/linux/edma.h b/include/linux/edma.h deleted file mode 100644 index a1307e7827e8..000000000000 --- a/include/linux/edma.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * TI EDMA DMA engine driver - * - * Copyright 2012 Texas Instruments - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -#ifndef __LINUX_EDMA_H -#define __LINUX_EDMA_H - -struct dma_chan; - -#if defined(CONFIG_TI_EDMA) || defined(CONFIG_TI_EDMA_MODULE) -bool edma_filter_fn(struct dma_chan *, void *); -#else -static inline bool edma_filter_fn(struct dma_chan *chan, void *param) -{ - return false; -} -#endif - -#endif