summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-13 23:48:03 +0800
committerHuang Shijie <b32955@freescale.com>2012-01-31 14:52:50 +0800
commitbddc5d0cbc539c160d04bfac93433bb4f97ca79e (patch)
tree1089daa03b85ee94746fe497a2e7f192450c09cb /include
parent861c37e943fbe5a460c47d9122c77887ea18c77a (diff)
dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
Before dma_transfer_direction was introduced to replace dma_data_direction, some dmaengine device uses DMA_NONE of dma_data_direction for some talk with its client drivers. The mxs-dma and its clients mxs-mmc and gpmi-nand are such case. This patch adds DMA_TRANS_NONE to dma_transfer_direction and migrate the DMA_NONE use in mxs-dma to it. It also fixes the compile warning below. CC drivers/dma/mxs-dma.o drivers/dma/mxs-dma.c: In function ‘mxs_dma_prep_slave_sg’: drivers/dma/mxs-dma.c:420:16: warning: comparison between ‘enum dma_transfer_direction’ and ‘enum dma_data_direction’ Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dmaengine.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index a865b3a354cd..9d5e4a4a77d5 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -88,6 +88,7 @@ enum dma_transfer_direction {
DMA_MEM_TO_DEV,
DMA_DEV_TO_MEM,
DMA_DEV_TO_DEV,
+ DMA_TRANS_NONE,
};
/**