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: [2/3] dmaengine: omap-dma: make omap_dma_filter_fn private From: Arnd Bergmann Message-Id: <20190307151646.1016966-2-arnd@arndb.de> Date: Thu, 7 Mar 2019 16:16:09 +0100 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 List-ID: V2l0aCB0aGUgYXVkaW8gZHJpdmVyIG5vIGxvbmdlciByZWZlcnJpbmcgdG8gdGhpcyBmdW5jdGlv biwgaXQKY2FuIGJlIG1hZGUgcHJpdmF0ZSB0byB0aGUgZG1hZW5naW5lIGRyaXZlciBpdHNlbGYs IGFuZCB0aGUKaGVhZGVyIGZpbGUgcmVtb3ZlZC4KClNpZ25lZC1vZmYtYnk6IEFybmQgQmVyZ21h bm4gPGFybmRAYXJuZGIuZGU+Ci0tLQogZHJpdmVycy9kbWEvdGkvb21hcC1kbWEuYyAgICAgIHwg IDMgKystCiBpbmNsdWRlL2xpbnV4L29tYXAtZG1hLmggICAgICAgfCAgMiAtLQogaW5jbHVkZS9s aW51eC9vbWFwLWRtYWVuZ2luZS5oIHwgMjEgLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCiBkZWxldGUgbW9kZSAx MDA2NDQgaW5jbHVkZS9saW51eC9vbWFwLWRtYWVuZ2luZS5oCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9kbWEvdGkvb21hcC1kbWEuYyBiL2RyaXZlcnMvZG1hL3RpL29tYXAtZG1hLmMKaW5kZXggYTRh OTMxZGRmNmY2Li41YmY2MzViYTIzNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hL3RpL29tYXAt ZG1hLmMKKysrIGIvZHJpdmVycy9kbWEvdGkvb21hcC1kbWEuYwpAQCAtMjA1LDYgKzIwNSw3IEBA IHN0YXRpYyBjb25zdCB1bnNpZ25lZCBlc19ieXRlc1tdID0gewogCVtDU0RQX0RBVEFfVFlQRV8z Ml0gPSA0LAogfTsKIAorc3RhdGljIGJvb2wgb21hcF9kbWFfZmlsdGVyX2ZuKHN0cnVjdCBkbWFf Y2hhbiAqY2hhbiwgdm9pZCAqcGFyYW0pOwogc3RhdGljIHN0cnVjdCBvZl9kbWFfZmlsdGVyX2lu Zm8gb21hcF9kbWFfaW5mbyA9IHsKIAkuZmlsdGVyX2ZuID0gb21hcF9kbWFfZmlsdGVyX2ZuLAog fTsKQEAgLTE2NDAsNyArMTY0MSw3IEBAIHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIG9t YXBfZG1hX2RyaXZlciA9IHsKIAl9LAogfTsKIAotYm9vbCBvbWFwX2RtYV9maWx0ZXJfZm4oc3Ry dWN0IGRtYV9jaGFuICpjaGFuLCB2b2lkICpwYXJhbSkKK3N0YXRpYyBib29sIG9tYXBfZG1hX2Zp bHRlcl9mbihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sIHZvaWQgKnBhcmFtKQogewogCWlmIChjaGFu LT5kZXZpY2UtPmRldi0+ZHJpdmVyID09ICZvbWFwX2RtYV9kcml2ZXIuZHJpdmVyKSB7CiAJCXN0 cnVjdCBvbWFwX2RtYWRldiAqb2QgPSB0b19vbWFwX2RtYV9kZXYoY2hhbi0+ZGV2aWNlKTsKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvb21hcC1kbWEuaCBiL2luY2x1ZGUvbGludXgvb21hcC1k bWEuaAppbmRleCA4NDBjZTU1MWU3NzMuLmJhM2NmYmI1MjMxMiAxMDA2NDQKLS0tIGEvaW5jbHVk ZS9saW51eC9vbWFwLWRtYS5oCisrKyBiL2luY2x1ZGUvbGludXgvb21hcC1kbWEuaApAQCAtMSw4 ICsxLDYgQEAKIC8qIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBHUEwtMi4wICovCiAjaWZuZGVm IF9fTElOVVhfT01BUF9ETUFfSAogI2RlZmluZSBfX0xJTlVYX09NQVBfRE1BX0gKLSNpbmNsdWRl IDxsaW51eC9vbWFwLWRtYWVuZ2luZS5oPgotCiAvKgogICogIExlZ2FjeSBPTUFQIERNQSBoYW5k bGluZyBkZWZpbmVzIGFuZCBmdW5jdGlvbnMKICAqCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4 L29tYXAtZG1hZW5naW5lLmggYi9pbmNsdWRlL2xpbnV4L29tYXAtZG1hZW5naW5lLmgKZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDhlNjkwNmM3MmU5MC4uMDAwMDAwMDAwMDAwCi0tLSBh L2luY2x1ZGUvbGludXgvb21hcC1kbWFlbmdpbmUuaAorKysgL2Rldi9udWxsCkBAIC0xLDIxICsw LDAgQEAKLS8qCi0gKiBPTUFQIERNQSBFbmdpbmUgc3VwcG9ydAotICoKLSAqIFRoaXMgcHJvZ3Jh bSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5 Ci0gKiBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNl IHZlcnNpb24gMiBhcwotICogcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b24uCi0gKi8KLSNpZm5kZWYgX19MSU5VWF9PTUFQX0RNQUVOR0lORV9ICi0jZGVmaW5lIF9fTElO VVhfT01BUF9ETUFFTkdJTkVfSAotCi1zdHJ1Y3QgZG1hX2NoYW47Ci0KLSNpZiBkZWZpbmVkKENP TkZJR19ETUFfT01BUCkgfHwgKGRlZmluZWQoQ09ORklHX0RNQV9PTUFQX01PRFVMRSkgJiYgZGVm aW5lZChNT0RVTEUpKQotYm9vbCBvbWFwX2RtYV9maWx0ZXJfZm4oc3RydWN0IGRtYV9jaGFuICos IHZvaWQgKik7Ci0jZWxzZQotc3RhdGljIGlubGluZSBib29sIG9tYXBfZG1hX2ZpbHRlcl9mbihz dHJ1Y3QgZG1hX2NoYW4gKmMsIHZvaWQgKmQpCi17Ci0JcmV0dXJuIGZhbHNlOwotfQotI2VuZGlm Ci0jZW5kaWYgLyogX19MSU5VWF9PTUFQX0RNQUVOR0lORV9IICovCg== 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 DCF0DC43381 for ; Thu, 7 Mar 2019 15:17:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A8CA620851 for ; Thu, 7 Mar 2019 15:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726512AbfCGPR5 (ORCPT ); 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 Content-Transfer-Encoding: 8bit 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== 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/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 */ -- 2.20.0