summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-12-31 19:32:10 +0530
committerVinod Koul <vkoul@kernel.org>2018-12-31 19:32:10 +0530
commit56e8e1a118a96b9d0d02efa6290b94d9082f69d3 (patch)
tree1c5bd8ae7982dede886e08187b92793d2d8e7c1d /drivers/dma
parent68ded1dcd138cccb7b0e7b23c7a0c5f7e3785535 (diff)
parentbc822e80170d672dd8ff0d07c521cf72f491cb6c (diff)
downloadlinux-56e8e1a118a96b9d0d02efa6290b94d9082f69d3.tar.gz
linux-56e8e1a118a96b9d0d02efa6290b94d9082f69d3.tar.bz2
linux-56e8e1a118a96b9d0d02efa6290b94d9082f69d3.zip
Merge branch 'topic/sa11x0' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/sa11x0-dma.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c
index b31d07c7d93c..784d5f1a473b 100644
--- a/drivers/dma/sa11x0-dma.c
+++ b/drivers/dma/sa11x0-dma.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/sa11x0-dma.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
@@ -830,6 +829,14 @@ static const struct dma_slave_map sa11x0_dma_map[] = {
{ "sa11x0-ssp", "rx", "Ser4SSPRc" },
};
+static bool sa11x0_dma_filter_fn(struct dma_chan *chan, void *param)
+{
+ struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
+ const char *p = param;
+
+ return !strcmp(c->name, p);
+}
+
static int sa11x0_dma_init_dmadev(struct dma_device *dmadev,
struct device *dev)
{
@@ -1087,18 +1094,6 @@ static struct platform_driver sa11x0_dma_driver = {
.remove = sa11x0_dma_remove,
};
-bool sa11x0_dma_filter_fn(struct dma_chan *chan, void *param)
-{
- if (chan->device->dev->driver == &sa11x0_dma_driver.driver) {
- struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
- const char *p = param;
-
- return !strcmp(c->name, p);
- }
- return false;
-}
-EXPORT_SYMBOL(sa11x0_dma_filter_fn);
-
static int __init sa11x0_dma_init(void)
{
return platform_driver_register(&sa11x0_dma_driver);