aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-07-16 05:28:46 -0400
committerVinod Koul <vinod.koul@intel.com>2013-08-19 04:50:21 -0400
commitb1baec525e75bcf4dd8c8824cfde476a98b13bab (patch)
treefe72ad18a6882db8440b1e8923cdf7c17b96a0b7
parente8690fc2bce24f0a96a0cfe8e1ffbfbd59438657 (diff)
dma: mxs-dma: remove code left from generic DMA binding conversion
With all mxs-dma clients moved to use generic DMA helper, the code left from generic DMA binding conversion can be removed now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/mxs-dma.c23
-rw-r--r--include/linux/fsl/mxs-dma.h20
2 files changed, 0 insertions, 43 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 6fb4b7bc448f..ccd13df841db 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -23,7 +23,6 @@
23#include <linux/dmaengine.h> 23#include <linux/dmaengine.h>
24#include <linux/delay.h> 24#include <linux/delay.h>
25#include <linux/module.h> 25#include <linux/module.h>
26#include <linux/fsl/mxs-dma.h>
27#include <linux/stmp_device.h> 26#include <linux/stmp_device.h>
28#include <linux/of.h> 27#include <linux/of.h>
29#include <linux/of_device.h> 28#include <linux/of_device.h>
@@ -197,24 +196,6 @@ static struct mxs_dma_chan *to_mxs_dma_chan(struct dma_chan *chan)
197 return container_of(chan, struct mxs_dma_chan, chan); 196 return container_of(chan, struct mxs_dma_chan, chan);
198} 197}
199 198
200int mxs_dma_is_apbh(struct dma_chan *chan)
201{
202 struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
203 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
204
205 return dma_is_apbh(mxs_dma);
206}
207EXPORT_SYMBOL_GPL(mxs_dma_is_apbh);
208
209int mxs_dma_is_apbx(struct dma_chan *chan)
210{
211 struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
212 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
213
214 return !dma_is_apbh(mxs_dma);
215}
216EXPORT_SYMBOL_GPL(mxs_dma_is_apbx);
217
218static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan) 199static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
219{ 200{
220 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; 201 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -349,13 +330,9 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id)
349static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) 330static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
350{ 331{
351 struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); 332 struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
352 struct mxs_dma_data *data = chan->private;
353 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; 333 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
354 int ret; 334 int ret;
355 335
356 if (data)
357 mxs_chan->chan_irq = data->chan_irq;
358
359 mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev, 336 mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev,
360 CCW_BLOCK_SIZE, &mxs_chan->ccw_phys, 337 CCW_BLOCK_SIZE, &mxs_chan->ccw_phys,
361 GFP_KERNEL); 338 GFP_KERNEL);
diff --git a/include/linux/fsl/mxs-dma.h b/include/linux/fsl/mxs-dma.h
deleted file mode 100644
index 55d870238399..000000000000
--- a/include/linux/fsl/mxs-dma.h
+++ /dev/null
@@ -1,20 +0,0 @@
1/*
2 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 */
8
9#ifndef __MACH_MXS_DMA_H__
10#define __MACH_MXS_DMA_H__
11
12#include <linux/dmaengine.h>
13
14struct mxs_dma_data {
15 int chan_irq;
16};
17
18extern int mxs_dma_is_apbh(struct dma_chan *chan);
19extern int mxs_dma_is_apbx(struct dma_chan *chan);
20#endif /* __MACH_MXS_DMA_H__ */