dmaengine: move drivers to dma_transfer_direction

fixup usage of dma direction by introducing dma_transfer_direction,
this patch moves dma/drivers/* to use new enum

Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Viresh Kumar <viresh.kumar@st.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Mika Westerberg <mika.westerberg@iki.fi>
Cc: H Hartley Sweeten <hartleys@visionengravers.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Zhang Wei <zw@zh-kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Shawn Guo <shawn.guo@freescale.com>
Cc: Yong Wang <yong.y.wang@intel.com>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Cc: Boojin Kim <boojin.kim@samsung.com>
Cc: Barry Song <Baohua.Song@csr.com>
Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

25 files changed, 150 insertions, 152 deletions

diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h
index 46d4d876e6f..e82c642fa53 100644
--- a/arch/arm/mach-ep93xx/include/mach/dma.h
+++ b/arch/arm/mach-ep93xx/include/mach/dma.h
@@ -37,7 +37,7 @@
  */
 struct ep93xx_dma_data {
         int                             port;
-        enum dma_data_direction         direction;
+        enum dma_transfer_direction     direction;
         const char                      *name;
 };
 
@@ -80,14 +80,14 @@ static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan)
  * channel supports given DMA direction. Only M2P channels have such
  * limitation, for M2M channels the direction is configurable.
  */
-static inline enum dma_data_direction
+static inline enum dma_transfer_direction
 ep93xx_dma_chan_direction(struct dma_chan *chan)
 {
         if (!ep93xx_dma_chan_is_m2p(chan))
                 return DMA_NONE;
 
         /* even channels are for TX, odd for RX */
-        return (chan->chan_id % 2 == 0) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
+        return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
 }
 
 #endif /* __ASM_ARCH_DMA_H */
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 685c78716d9..38b041a40db 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -187,7 +187,7 @@ static inline struct
 dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
                                             dma_addr_t addr,
                                             unsigned int size,
-                                            enum dma_data_direction direction,
+                                            enum dma_transfer_direction direction,
                                             unsigned long flags)
 {
         struct scatterlist sg;
@@ -209,7 +209,7 @@ static inline struct
 dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
                                             dma_addr_t addr,
                                             unsigned int size,
-                                            enum dma_data_direction direction,
+                                            enum dma_transfer_direction direction,
                                             unsigned long flags)
 {
         return NULL;
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index b7cbd1ab1db..41c62fd0680 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -882,9 +882,9 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,
                 ch->signal = ret;
 
                 /* Assign the flow control signal to this channel */
-                if (txd->direction == DMA_TO_DEVICE)
+                if (txd->direction == DMA_MEM_TO_DEV)
                         txd->ccfg |= ch->signal << PL080_CONFIG_DST_SEL_SHIFT;
-                else if (txd->direction == DMA_FROM_DEVICE)
+                else if (txd->direction == DMA_DEV_TO_MEM)
                         txd->ccfg |= ch->signal << PL080_CONFIG_SRC_SEL_SHIFT;
         }
 
@@ -1102,10 +1102,10 @@ static int dma_set_runtime_config(struct dma_chan *chan,
 
         /* Transfer direction */
         plchan->runtime_direction = config->direction;
-        if (config->direction == DMA_TO_DEVICE) {
+        if (config->direction == DMA_MEM_TO_DEV) {
                 addr_width = config->dst_addr_width;
                 maxburst = config->dst_maxburst;
-        } else if (config->direction == DMA_FROM_DEVICE) {
+        } else if (config->direction == DMA_DEV_TO_MEM) {
                 addr_width = config->src_addr_width;
                 maxburst = config->src_maxburst;
         } else {
@@ -1136,7 +1136,7 @@ static int dma_set_runtime_config(struct dma_chan *chan,
         cctl |= burst << PL080_CONTROL_SB_SIZE_SHIFT;
         cctl |= burst << PL080_CONTROL_DB_SIZE_SHIFT;
 
-        if (plchan->runtime_direction == DMA_FROM_DEVICE) {
+        if (plchan->runtime_direction == DMA_DEV_TO_MEM) {
                 plchan->src_addr = config->src_addr;
                 plchan->src_cctl = pl08x_cctl(cctl) | PL080_CONTROL_DST_INCR |
                         pl08x_select_bus(plchan->cd->periph_buses,
@@ -1152,7 +1152,7 @@ static int dma_set_runtime_config(struct dma_chan *chan,
                 "configured channel %s (%s) for %s, data width %d, "
                 "maxburst %d words, LE, CCTL=0x%08x\n",
                 dma_chan_name(chan), plchan->name,
-                (config->direction == DMA_FROM_DEVICE) ? "RX" : "TX",
+                (config->direction == DMA_DEV_TO_MEM) ? "RX" : "TX",
                 addr_width,
                 maxburst,
                 cctl);
@@ -1322,7 +1322,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(
 
 static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
                 struct dma_chan *chan, struct scatterlist *sgl,
-                unsigned int sg_len, enum dma_data_direction direction,
+                unsigned int sg_len, enum dma_transfer_direction direction,
                 unsigned long flags)
 {
         struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
@@ -1354,10 +1354,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
          */
         txd->direction = direction;
 
-        if (direction == DMA_TO_DEVICE) {
+        if (direction == DMA_MEM_TO_DEV) {
                 txd->cctl = plchan->dst_cctl;
                 slave_addr = plchan->dst_addr;
-        } else if (direction == DMA_FROM_DEVICE) {
+        } else if (direction == DMA_DEV_TO_MEM) {
                 txd->cctl = plchan->src_cctl;
                 slave_addr = plchan->src_addr;
         } else {
@@ -1368,10 +1368,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
         }
 
         if (plchan->cd->device_fc)
-                tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER_PER :
+                tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER_PER :
                         PL080_FLOW_PER2MEM_PER;
         else
-                tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER :
+                tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER :
                         PL080_FLOW_PER2MEM;