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.
Unified · Split
| @@ -15,7 +15,6 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <linux/dmaengine.h> |
| 17 | 17 | #include <linux/dma-mapping.h> |
| 18 | −#include <linux/edma.h> | |
| 19 | 18 | #include <linux/err.h> |
| 20 | 19 | #include <linux/init.h> |
| 21 | 20 | #include <linux/interrupt.h> |
| @@ -2185,6 +2184,8 @@ static struct dma_chan *of_edma_xlate(struct of_phandle_args *dma_spec, · 2163 unmodified lines | ||
| 2185 | 2184 | } |
| 2186 | 2185 | #endif |
| 2187 | 2186 | |
| 2187 | +static bool edma_filter_fn(struct dma_chan *chan, void *param); | |
| 2188 | + | |
| 2188 | 2189 | static int edma_probe(struct platform_device *pdev) |
| 2189 | 2190 | { |
| 2190 | 2191 | struct edma_soc_info *info = pdev->dev.platform_data; |
| @@ -2524,7 +2525,7 @@ static struct platform_driver edma_tptc_driver = { · 333 unmodified lines | ||
| 2524 | 2525 | }, |
| 2525 | 2526 | }; |
| 2526 | 2527 | |
| 2527 | −bool edma_filter_fn(struct dma_chan *chan, void *param) | |
| 2528 | +static bool edma_filter_fn(struct dma_chan *chan, void *param) | |
| 2528 | 2529 | { |
| 2529 | 2530 | bool match = false; |
| 2530 | 2531 | |
| @@ -1,29 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * TI EDMA DMA engine driver | |
| 3 | − * | |
| 4 | − * Copyright 2012 Texas Instruments | |
| 5 | − * | |
| 6 | − * This program is free software; you can redistribute it and/or | |
| 7 | − * modify it under the terms of the GNU General Public License as | |
| 8 | − * published by the Free Software Foundation version 2. | |
| 9 | − * | |
| 10 | − * This program is distributed "as is" WITHOUT ANY WARRANTY of any | |
| 11 | − * kind, whether express or implied; without even the implied warranty | |
| 12 | − * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 | − * GNU General Public License for more details. | |
| 14 | − */ | |
| 15 | −#ifndef __LINUX_EDMA_H | |
| 16 | −#define __LINUX_EDMA_H | |
| 17 | − | |
| 18 | −struct dma_chan; | |
| 19 | − | |
| 20 | −#if defined(CONFIG_TI_EDMA) || defined(CONFIG_TI_EDMA_MODULE) | |
| 21 | −bool edma_filter_fn(struct dma_chan *, void *); | |
| 22 | −#else | |
| 23 | −static inline bool edma_filter_fn(struct dma_chan *chan, void *param) | |
| 24 | −{ | |
| 25 | − return false; | |
| 26 | −} | |
| 27 | −#endif | |
| 28 | − | |
| 29 | −#endif | |