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: 10843151 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 68DC91575 for ; Thu, 7 Mar 2019 15:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 464D62F339 for ; Thu, 7 Mar 2019 15:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 332D52F33F; Thu, 7 Mar 2019 15:18:04 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 734092F339 for ; Thu, 7 Mar 2019 15:18:03 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9D78E85D; Thu, 7 Mar 2019 16:17:11 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9D78E85D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551971881; bh=KV4TMqKjUemYs12QwGasMMQkBcxeeBdWbgNpKujZPWw=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=bnzXPY4vo6z/CKUo29l8lBZulowhcXSjCb5tGs/oYD3nN31OARIJ+RJvyGPkUlCiZ gd6ULQ3HUTbzzEHdDKlAAWi+7LGWJKRXLvK18tjEfYU73fg+oRa7BRe8sDTzFKOH/U mOgqW2HY2IyQ7Jxn//4FnH8xstMJkGZk/XwUq4xA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1B723F896EC; Thu, 7 Mar 2019 16:17:11 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7461DF896F0; Thu, 7 Mar 2019 16:17:09 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D602CF806F7 for ; Thu, 7 Mar 2019 16:17:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D602CF806F7 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 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== Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Tony Lindgren , Liam Girdwood , linux-kernel@vger.kernel.org, Peter Ujfalusi , Vinod Koul , dmaengine@vger.kernel.org, linux-omap@vger.kernel.org, Jarkko Nikula Subject: [alsa-devel] [PATCH 1/3] ASoC: ti: remove compat dma probing X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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); 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: 10843157 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 5E0451823 for ; Thu, 7 Mar 2019 15:19:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 485522DB0D for ; Thu, 7 Mar 2019 15:19:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AD732DF45; Thu, 7 Mar 2019 15:19:01 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 81C962BE28 for ; Thu, 7 Mar 2019 15:19:00 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A27C386D; Thu, 7 Mar 2019 16:18:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A27C386D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551971938; bh=r9FgdkABWpD0Cr6CLlXoQPWX+QW8N7DVWS+snvq3cA4=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=AbU6vBYQunrGqr23dr0muaqxp2IP28/dzS6ceZmHCSEcODMyVR3tajPVFozp2OI0w jdJRol/FytctLUJQpnSkvwAPa9IThWaKo+9N++2/hCAEl+khJ7ZH3Y0wr8kVp788+O 8gJlwE+dTtxKHK3jBr/DCncisT30Ofo0LTML7Wrc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5726EF896FB; Thu, 7 Mar 2019 16:17:55 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1C457F896FC; Thu, 7 Mar 2019 16:17:54 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 616DFF8065A for ; Thu, 7 Mar 2019 16:17:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 616DFF8065A 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 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-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== Cc: dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, Dan Williams , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH 2/3] dmaengine: omap-dma: make omap_dma_filter_fn private X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Peter Ujfalusi --- 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 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: 10843165 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 3FAB51823 for ; Thu, 7 Mar 2019 15:19:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276652EF02 for ; Thu, 7 Mar 2019 15:19:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17EE52F0A6; Thu, 7 Mar 2019 15:19:46 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5EC22EF02 for ; Thu, 7 Mar 2019 15:19:44 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E9FEA85F; Thu, 7 Mar 2019 16:18:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E9FEA85F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551971983; bh=ERe+RM+Z22h+McK2FKTvL8WYjz8s/7mnfMk/FIP55W0=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MOcwIWdsdgvioKJMacyCjQzjG0vrx/qy3dROFkKjpxWFakb5/ehS7iHtUSwhfZZO8 KfGClGmximN1VVWA/uGWRgQ7i1gMnCzi2hx5roC36ORfrOMiftP8HncKJQ7gOsuShE 3tagrGyEBOTo8qg/w6D7wHgDte4ia4UCro3scCP4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id CC5E3F896FE; Thu, 7 Mar 2019 16:18:20 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1F64CF89703; Thu, 7 Mar 2019 16:18:19 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A3E14F806F7 for ; Thu, 7 Mar 2019 16:18:16 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A3E14F806F7 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 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-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== Cc: dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, Dan Williams , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH 3/3] dmaengine: edma: make edma_filter_fn private X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Peter Ujfalusi --- 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 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