diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-12 13:26:49 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-12 13:26:49 -0800 |
| commit | 330a7809cf90f8e6d29cb3c13e58bc7bb532b1ae (patch) | |
| tree | 42b45a0a4c5d72d084f9ff9e4aaae2df3e93b604 | |
| parent | 202f9977b012d844d08e6d01d12bad891e95b3ae (diff) | |
| parent | c2a70a319afb9e3dee16567cec4d9bf8dd358b59 (diff) | |
| download | linux-330a7809cf90f8e6d29cb3c13e58bc7bb532b1ae.tar.bz2 | |
Merge tag 'pxa-for-4.21' of https://github.com/rjarzmik/linux into next/drivers
This pxa update brings only a single patch, finishing the
dmaengine conversion.
* tag 'pxa-for-4.21' of https://github.com/rjarzmik/linux:
dmaengine: pxa: make the filter function internal
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/dma/pxa_dma.c | 5 | ||||
| -rw-r--r-- | include/linux/dma/pxa-dma.h | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 825725057e00..c7a328f81485 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -179,7 +179,7 @@ static unsigned int pxad_drcmr(unsigned int line) return 0x1000 + line * 4; } -bool pxad_filter_fn(struct dma_chan *chan, void *param); +static bool pxad_filter_fn(struct dma_chan *chan, void *param); /* * Debug fs @@ -1500,7 +1500,7 @@ static struct platform_driver pxad_driver = { .remove = pxad_remove, }; -bool pxad_filter_fn(struct dma_chan *chan, void *param) +static bool pxad_filter_fn(struct dma_chan *chan, void *param) { struct pxad_chan *c = to_pxad_chan(chan); struct pxad_param *p = param; @@ -1513,7 +1513,6 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param) return true; } -EXPORT_SYMBOL_GPL(pxad_filter_fn); module_platform_driver(pxad_driver); diff --git a/include/linux/dma/pxa-dma.h b/include/linux/dma/pxa-dma.h index 9fc594f69eff..fceb5df07097 100644 --- a/include/linux/dma/pxa-dma.h +++ b/include/linux/dma/pxa-dma.h @@ -23,15 +23,4 @@ struct pxad_param { enum pxad_chan_prio prio; }; -struct dma_chan; - -#ifdef CONFIG_PXA_DMA -bool pxad_filter_fn(struct dma_chan *chan, void *param); -#else -static inline bool pxad_filter_fn(struct dma_chan *chan, void *param) -{ - return false; -} -#endif - #endif /* _PXA_DMA_H_ */ |