Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Shawn Guo and committed by
Vinod Koul
b1baec52 e8690fc2

-43
-23
drivers/dma/mxs-dma.c
··· 23 23 #include <linux/dmaengine.h> 24 24 #include <linux/delay.h> 25 25 #include <linux/module.h> 26 - #include <linux/fsl/mxs-dma.h> 27 26 #include <linux/stmp_device.h> 28 27 #include <linux/of.h> 29 28 #include <linux/of_device.h> ··· 196 197 return container_of(chan, struct mxs_dma_chan, chan); 197 198 } 198 199 199 - int mxs_dma_is_apbh(struct dma_chan *chan) 200 - { 201 - struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); 202 - struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; 203 - 204 - return dma_is_apbh(mxs_dma); 205 - } 206 - EXPORT_SYMBOL_GPL(mxs_dma_is_apbh); 207 - 208 - int mxs_dma_is_apbx(struct dma_chan *chan) 209 - { 210 - struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); 211 - struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; 212 - 213 - return !dma_is_apbh(mxs_dma); 214 - } 215 - EXPORT_SYMBOL_GPL(mxs_dma_is_apbx); 216 - 217 200 static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan) 218 201 { 219 202 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; ··· 330 349 static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) 331 350 { 332 351 struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan); 333 - struct mxs_dma_data *data = chan->private; 334 352 struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; 335 353 int ret; 336 - 337 - if (data) 338 - mxs_chan->chan_irq = data->chan_irq; 339 354 340 355 mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev, 341 356 CCW_BLOCK_SIZE, &mxs_chan->ccw_phys,
-20
include/linux/fsl/mxs-dma.h
··· 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 - 14 - struct mxs_dma_data { 15 - int chan_irq; 16 - }; 17 - 18 - extern int mxs_dma_is_apbh(struct dma_chan *chan); 19 - extern int mxs_dma_is_apbx(struct dma_chan *chan); 20 - #endif /* __MACH_MXS_DMA_H__ */