From patchwork Mon Jul 22 08:16:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 169355 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7216093ilk; Mon, 22 Jul 2019 01:17:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyhZplkzS4NexYRM0ywR81HkwvrEvO7KVE+T+oex7ImfKVci76IQNLZApSxMqFUxL8P/We0 X-Received: by 2002:a17:902:b70e:: with SMTP id d14mr73381564pls.309.1563783438872; Mon, 22 Jul 2019 01:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563783438; cv=none; d=google.com; s=arc-20160816; b=F80TXPCzPPq57PwShyQNMlQyBAfbgsjt7/M/dECKmgCLxbJFQgEC2be/UW2LX5hi/U y/5K06M14XXfuXbJ9ef5viFAekb4yvQgcexFTOw6QBvY98VEIH+mvI0xIa6VfVsTt1RK cEGkrB62ZUTwDs9iGa5PSbO1baerYkchk4sUmomrecl/EqpPMbHKx63Ydq0+4aCD3qyP qWuI+hYopNT3B6uHsFi+vHqdiaKeSVUSeThB/sHMlsISkJ5ze8K3JhRwmjfhVm3gueq2 oquPwiP7YGjcP9YXq1M0PB/mmom9uG6yfYQmFRYXEstAHrl6kAS/uWnjLPZcpGOObOiM DQbw== 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=13yrhH5vCcMEHeVrW86ct7WtO91l7xlUjiFFxxV3JsA=; b=JYi8Ve0OpQsNnmEXtKJSuG3ODBsPbyzfRdumit6R13+VGvzphyXbBE8baTBFX307b9 Z///O6LwSv0lBBvldrArj/BGDqUAeJpUEzydo8HhHkTm4jY30LwSYrphSDBWwdAgsHzV Cyt+nNnx52pYs9BTBowEJpCEL79daW9YYQl4LsUxguAs47TBh2qDe47FtaVrR9sh1vys 6+qoem7syTRZJWSzkvQESvE26joce8VP5Czxl6z6qxXgAwn93LWBoDcjowN4jr7K7OLl w0W/MpCSkD2u9LQV9p9gSZAShm2iiDt2mDvJK0X3Vaor5PUYnSxEYTqEOrz4WPFfTWSc QKlg== 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 q10si8229687pgf.529.2019.07.22.01.17.18; Mon, 22 Jul 2019 01:17:18 -0700 (PDT) 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 S1728120AbfGVIRS (ORCPT + 3 others); Mon, 22 Jul 2019 04:17:18 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:58353 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727507AbfGVIRS (ORCPT ); Mon, 22 Jul 2019 04:17:18 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N0WwO-1iapR13BiO-00wRIY; Mon, 22 Jul 2019 10:17:07 +0200 From: Arnd Bergmann To: Vinod Koul Cc: Arnd Bergmann , Peter Ujfalusi , Dan Williams , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org Subject: [PATCH 1/2] [RESEND] dmaengine: omap-dma: make omap_dma_filter_fn private Date: Mon, 22 Jul 2019 10:16:44 +0200 Message-Id: <20190722081705.2084961-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:LKbwgWIj99FT91eh3WOwgz3gfMVv38yDY9pLODrS9xdzX3TdFjV sFyqqjXOs2vi7MeJORJiXvPYE0nqYIIMrSQg+DpC+H487tn0ovRPidXyNIjBl3gbBa/2Qt9 GlYqd/ES7eUpSkYyKi1Wzyxh2uC2cRirVml1x018NBxF2jDP1iyy+PW6GKXsVTyZeFJ2CYr fYJ0X6D8vRlMD9YdCf/PQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:OV4ZnAdg0O0=:m7QYF8tm2fgfGSeNLShlKm f8+Fr36c1zaf1fVJO0OGKEXPqdY2xAnHCKMvC39HLGQ8KbGj5pBKn9bRZT7CQKjaidSFPw8h8 oAsLPq/3OayiF2JDUvc7tI1YL6e0D4aKcT1X8qwQi3Ny9rRsjn8QpljjS1/deKcvlcWZPuiK/ Fcp3CqoFZxGFiCWQ2tbEd5iukje6r0hg9ulo4MHZXPEl9Dwmcy2BdOHQ9Zd+1pUkwF47T2D4E HelDflpgbXqD5vNRKyQleEX3TvIt5HNG4f2DXyQuMZO5Ma9K+Rikh+pMfBHAB0SNZN5JONzzz EIIyHhgcx45nWsEnhYsRJ5+/qMC0MdyDgI1YQMlYA/qo95Bu+xJJ8nsEo+cN5JmLGEFcI/xRm 1pkTQ1yEhExyTFWaypb0QGJBxAoKJ1NER5AjUI0QoWAKCQYrAHjuobOHV7Q+ny15q2+phA56G aXvG/ysBO9bJRnBOQX2xzRrMJmaaX73VU4C7Kf05RwKXAF5DvUKYotGNdqEt+voGEKllleijA 8Hljb7zaf1FJGZ9Cb4QK+1NXRqn29OdzT/4/oyETH0KJqqogU4hldbgvW0khaTgMXTk3Q/omG ezCodrRF4Nu32XOE9BZPPXwTv3zE/9kZZiGzdKSFE/k6RknIiPaDgbvbLPmQ8/qCQxE8ApBat I2HA7QGvIZrWUoVlDQHE6H9Nd+vRJR9mjxq/W20aTYWIkjdg/JO2PudG6OGpSxxvXxdWSjxKa RGo4ctJZap340ayVbfWPCRRrf2YHYT8P5hfDlw== 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. Acked-by: Peter Ujfalusi Link: https://lore.kernel.org/lkml/20190307151646.1016966-1-arnd@arndb.de/ Signed-off-by: Arnd Bergmann --- Sent originally in March, but had some dependency problems back then, please apply these now. --- 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 diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index ba2489d4ea24..49da402a1927 100644 --- a/drivers/dma/ti/omap-dma.c +++ b/drivers/dma/ti/omap-dma.c @@ -202,6 +202,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, }; @@ -1637,7 +1638,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 Mon Jul 22 08:16:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 169356 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7216269ilk; Mon, 22 Jul 2019 01:17:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGvPDf5BOBSW6bLKfvHyFDin6QK0FKwLpJW6QFhbH9rKbtXpT439iPGnIV9ILRL9U9E5Bv X-Received: by 2002:a65:65c5:: with SMTP id y5mr69715834pgv.342.1563783451307; Mon, 22 Jul 2019 01:17:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563783451; cv=none; d=google.com; s=arc-20160816; b=miH1RERiBxYs0BrrvNfAPTgk4dNfgWghrY2Nr+OB2SUfeXUrcRWIT5QMvfDaA4PdxK 3RSRw9dzRpPB7f7BJy56LQYcQc7e1f2aKUIgZM/2VhruLY7509vH5bJmLQJM17n9JJ1d Ad+N5vPsNf3t2Ci6nFS/UkUYBXLQaxByFnDQStviSAgEqQklWe0ArDL/aozTjyVpmwI9 6DxeDs8MH9FUnifwr0io5JrOEnGQ2aq/S0SG9WplHVtSoD48aDveNembvLlpSC1/GsnR qPpNMmd8CeGtcM/OmJptgeXsyEw60ZIBOEyYCJ2TtrwzMMa6yhW2NSoNqp5P3qPTp3UT Dlzw== 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=hU10i8iQKJ4fe6SiXZmxfmEnp/TLDOuThpPM9AJg2D0=; b=WmaIaKqrJfiKn4PqE8i8YalZmhkELwnV1MIPHcm5X4I/0Lvg8btRf7awya5nExwq3V dBsD4nS1C7isJ63UKVRl0Bnp2STvLd7lFbcwawCH4nZBu4Ui+4kp25afm7XG8J32Lvy/ wxuAiwHexDpkeVPz0rpzdKclgFXa4DgURESUiIstyJQMg+4yVRAElCLbBvGoW8fY8Wfz cLl/FIYtTJhVBriWDDWo4YfUyCSVFVIrB8gmpfVFDs8sbEyNCWQ+8igBEiWMN2WeXn1G OfcVRsry+JF3uawLB1dWVzr7jMOEsYVo3OIHIBWcYth/47ruHHj6fsBTbreBwjYl7FSF 3kUQ== 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 g13si9675962pgk.369.2019.07.22.01.17.31; Mon, 22 Jul 2019 01:17:31 -0700 (PDT) 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 S1728171AbfGVIRa (ORCPT + 3 others); Mon, 22 Jul 2019 04:17:30 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:33887 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727507AbfGVIRa (ORCPT ); Mon, 22 Jul 2019 04:17:30 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1Md6dH-1iP5RM2jn1-00aFLR; Mon, 22 Jul 2019 10:17:19 +0200 From: Arnd Bergmann To: Vinod Koul Cc: Arnd Bergmann , Peter Ujfalusi , Dan Williams , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org Subject: [PATCH 2/2] [RESEND] dmaengine: edma: make edma_filter_fn private Date: Mon, 22 Jul 2019 10:16:45 +0200 Message-Id: <20190722081705.2084961-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190722081705.2084961-1-arnd@arndb.de> References: <20190722081705.2084961-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Dnr5n+ZItdHytTchgOkzFl+KTT+XSHwDwbPeg+P7EMEMi4HQWHS NtjJDJQK5Nl0CZMrhaENiYUQ6y/NdV5X1Ki2oAhiwkHDdr9kQVU6956cR9tw7Bbk0QIvOsr EU4KMoXlP7kD6k0sdJE6VfeTesAXOdaY8TmS0qKTmj4LD11rDUjIKKUbUXwTwR/DtfD8eSm t0aouriRLQKQkYLtStXwA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:c/l2lO7keco=:m9a6Mm+tfPiM4ACkSiJbuX ASYKmmC//imkpregzHbJz+IgnbO8+7qZcXDz7QvHhy5gvOUcz8ZKANfcAFVobYV+R2Dm5XCqU noEeq+0ccMUGc6/np3/94r3S+hV8+zDGCxC6UlOckq8hH94jvMQVZZypj4yJceP1u8GkfBoRn dsVtu6uTllWxXRxVzMeG4FzxcW44Gnc9Pcwm6snFpIJB5YqNLqNv21/L6kt/2GcLl2uhOvp1E 1mmDqSf95ADz3lM4wgnHuwXbGhvo2RwrsAP/HJBO/wtGBA4r2Ihr7YNgt9cl94ZTWWZOFiI5H DMLGBV9uHo8Ne8uRjqS0oJQtePX1hxEgVIxT0st/aHixUZf8QHIZN2Zd1Svw57ndBNtNtGJye ZPQnxgTruse15JTdOoWowqHUajDRhmNOW3FkvRs/TkApCSSSQCyIPwwk+FuEmpTXjjluGL6BJ q9uWuUOv61irCz8TMjhR7RbcjbXfjANrIfa7Te8hp6PPHh6TV3DddUanokK2zhjbZ5HEFuMcP xlI5dFonS+aYvSX/pJhg5mrONIwNzU4OGKQbsmOoFLks1VS4vMgVCzTBnRo4bm0nkDuNfk38N uPDXiWc67hZQuXVUBE2F4dmrcG6dPw/DMdBIQ1Ywg9l8351TBk/bDs/sGdZjqkddtFN8iyW2o wbsxVFBfUBjlbL8dLGQWdeajGtAELWp2Oq+sHjGsu4JAL3lYscmXvck1qdSWfTkXWtN/QivMv 9yCD9UWv9ibycEN4lec+BXuZ01qzXCsvJl+yNA== 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. Acked-by: Peter Ujfalusi 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