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: [3/3] dmaengine: edma: make edma_filter_fn private From: Arnd Bergmann Message-Id: <20190307151646.1016966-3-arnd@arndb.de> Date: Thu, 7 Mar 2019 16:16:10 +0100 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 List-ID: V2l0aCB0aGUgYXVkaW8gZHJpdmVyIG5vIGxvbmdlciByZWZlcnJpbmcgdG8gdGhpcyBmdW5jdGlv biwgaXQKY2FuIGJlIG1hZGUgcHJpdmF0ZSB0byB0aGUgZG1hZW5naW5lIGRyaXZlciBpdHNlbGYs IGFuZCB0aGUKaGVhZGVyIGZpbGUgcmVtb3ZlZC4KClNpZ25lZC1vZmYtYnk6IEFybmQgQmVyZ21h bm4gPGFybmRAYXJuZGIuZGU+Ci0tLQogZHJpdmVycy9kbWEvdGkvZWRtYS5jIHwgIDUgKysrLS0K IGluY2x1ZGUvbGludXgvZWRtYS5oICB8IDI5IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCiBkZWxl dGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9saW51eC9lZG1hLmgKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2RtYS90aS9lZG1hLmMgYi9kcml2ZXJzL2RtYS90aS9lZG1hLmMKaW5kZXggY2VhYmRlYTQwYWUw Li5mMjU0OWVlM2ZiNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hL3RpL2VkbWEuYworKysgYi9k cml2ZXJzL2RtYS90aS9lZG1hLmMKQEAgLTE1LDcgKzE1LDYgQEAKIAogI2luY2x1ZGUgPGxpbnV4 L2RtYWVuZ2luZS5oPgogI2luY2x1ZGUgPGxpbnV4L2RtYS1tYXBwaW5nLmg+Ci0jaW5jbHVkZSA8 bGludXgvZWRtYS5oPgogI2luY2x1ZGUgPGxpbnV4L2Vyci5oPgogI2luY2x1ZGUgPGxpbnV4L2lu aXQuaD4KICNpbmNsdWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4KQEAgLTIxODUsNiArMjE4NCw4IEBA IHN0YXRpYyBzdHJ1Y3QgZG1hX2NoYW4gKm9mX2VkbWFfeGxhdGUoc3RydWN0IG9mX3BoYW5kbGVf YXJncyAqZG1hX3NwZWMsCiB9CiAjZW5kaWYKIAorc3RhdGljIGJvb2wgZWRtYV9maWx0ZXJfZm4o c3RydWN0IGRtYV9jaGFuICpjaGFuLCB2b2lkICpwYXJhbSk7CisKIHN0YXRpYyBpbnQgZWRtYV9w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogewogCXN0cnVjdCBlZG1hX3NvY19p bmZvCSppbmZvID0gcGRldi0+ZGV2LnBsYXRmb3JtX2RhdGE7CkBAIC0yNTI0LDcgKzI1MjUsNyBA QCBzdGF0aWMgc3RydWN0IHBsYXRmb3JtX2RyaXZlciBlZG1hX3RwdGNfZHJpdmVyID0gewogCX0s CiB9OwogCi1ib29sIGVkbWFfZmlsdGVyX2ZuKHN0cnVjdCBkbWFfY2hhbiAqY2hhbiwgdm9pZCAq cGFyYW0pCitzdGF0aWMgYm9vbCBlZG1hX2ZpbHRlcl9mbihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4s IHZvaWQgKnBhcmFtKQogewogCWJvb2wgbWF0Y2ggPSBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvaW5j bHVkZS9saW51eC9lZG1hLmggYi9pbmNsdWRlL2xpbnV4L2VkbWEuaApkZWxldGVkIGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggYTEzMDdlNzgyN2U4Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS9s aW51eC9lZG1hLmgKKysrIC9kZXYvbnVsbApAQCAtMSwyOSArMCwwIEBACi0vKgotICogVEkgRURN QSBETUEgZW5naW5lIGRyaXZlcgotICoKLSAqIENvcHlyaWdodCAyMDEyIFRleGFzIEluc3RydW1l bnRzCi0gKgotICogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0 cmlidXRlIGl0IGFuZC9vcgotICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05V IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMKLSAqIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uIHZlcnNpb24gMi4KLSAqCi0gKiBUaGlzIHByb2dyYW0gaXMgZGlzdHJp YnV0ZWQgImFzIGlzIiBXSVRIT1VUIEFOWSBXQVJSQU5UWSBvZiBhbnkKLSAqIGtpbmQsIHdoZXRo ZXIgZXhwcmVzcyBvciBpbXBsaWVkOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkK LSAqIG9mIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RS4gIFNlZSB0aGUKLSAqIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFp bHMuCi0gKi8KLSNpZm5kZWYgX19MSU5VWF9FRE1BX0gKLSNkZWZpbmUgX19MSU5VWF9FRE1BX0gK LQotc3RydWN0IGRtYV9jaGFuOwotCi0jaWYgZGVmaW5lZChDT05GSUdfVElfRURNQSkgfHwgZGVm aW5lZChDT05GSUdfVElfRURNQV9NT0RVTEUpCi1ib29sIGVkbWFfZmlsdGVyX2ZuKHN0cnVjdCBk bWFfY2hhbiAqLCB2b2lkICopOwotI2Vsc2UKLXN0YXRpYyBpbmxpbmUgYm9vbCBlZG1hX2ZpbHRl cl9mbihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sIHZvaWQgKnBhcmFtKQotewotCXJldHVybiBmYWxz ZTsKLX0KLSNlbmRpZgotCi0jZW5kaWYK 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 2A448C43381 for ; Thu, 7 Mar 2019 15:18:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F405520840 for ; Thu, 7 Mar 2019 15:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726526AbfCGPSV (ORCPT ); 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 Content-Transfer-Encoding: 8bit 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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 -- 2.20.0