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>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index a4a398f2ef61..8c880729b094 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -90,7 +90,7 @@ struct timb_dma_chan {
         struct list_head        queue;
         struct list_head        free_list;
         unsigned int            bytes_per_line;
-        enum dma_data_direction direction;
+        enum dma_transfer_direction     direction;
         unsigned int            descs; /* Descriptors to allocate */
         unsigned int            desc_elems; /* number of elems per descriptor */
 };
@@ -235,7 +235,7 @@ static void __td_start_dma(struct timb_dma_chan *td_chan)
                 "td_chan: %p, chan: %d, membase: %p\n",
                 td_chan, td_chan->chan.chan_id, td_chan->membase);
 
-        if (td_chan->direction == DMA_FROM_DEVICE) {
+        if (td_chan->direction == DMA_DEV_TO_MEM) {
 
                 /* descriptor address */
                 iowrite32(0, td_chan->membase + TIMBDMA_OFFS_RX_DHAR);
@@ -278,7 +278,7 @@ static void __td_finish(struct timb_dma_chan *td_chan)
                 txd->cookie);
 
         /* make sure to stop the transfer */
-        if (td_chan->direction == DMA_FROM_DEVICE)
+        if (td_chan->direction == DMA_DEV_TO_MEM)
                 iowrite32(0, td_chan->membase + TIMBDMA_OFFS_RX_ER);
 /* Currently no support for stopping DMA transfers
         else
@@ -398,7 +398,7 @@ static struct timb_dma_desc *td_alloc_init_desc(struct timb_dma_chan *td_chan)
         td_desc->txd.flags = DMA_CTRL_ACK;
 
         td_desc->txd.phys = dma_map_single(chan2dmadev(chan),
-                td_desc->desc_list, td_desc->desc_list_len, DMA_TO_DEVICE);
+                td_desc->desc_list, td_desc->desc_list_len, DMA_MEM_TO_DEV);
 
         err = dma_mapping_error(chan2dmadev(chan), td_desc->txd.phys);
         if (err) {
@@ -419,7 +419,7 @@ static void td_free_desc(struct timb_dma_desc *td_desc)
 {
         dev_dbg(chan2dev(td_desc->txd.chan), "Freeing desc: %p\n", td_desc);
         dma_unmap_single(chan2dmadev(td_desc->txd.chan), td_desc->txd.phys,
-                td_desc->desc_list_len, DMA_TO_DEVICE);
+                td_desc->desc_list_len, DMA_MEM_TO_DEV);
 
         kfree(td_desc->desc_list);
         kfree(td_desc);
@@ -558,7 +558,7 @@ static void td_issue_pending(struct dma_chan *chan)
 
 static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan,
         struct scatterlist *sgl, unsigned int sg_len,
-        enum dma_data_direction direction, unsigned long flags)
+        enum dma_transfer_direction direction, unsigned long flags)
 {
         struct timb_dma_chan *td_chan =
                 container_of(chan, struct timb_dma_chan, chan);
@@ -606,7 +606,7 @@ static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan,
         }
 
         dma_sync_single_for_device(chan2dmadev(chan), td_desc->txd.phys,
-                td_desc->desc_list_len, DMA_TO_DEVICE);
+                td_desc->desc_list_len, DMA_MEM_TO_DEV);
 
         return &td_desc->txd;
 }
@@ -775,8 +775,8 @@ static int __devinit td_probe(struct platform_device *pdev)
                 td_chan->descs = pchan->descriptors;
                 td_chan->desc_elems = pchan->descriptor_elements;
                 td_chan->bytes_per_line = pchan->bytes_per_line;
-                td_chan->direction = pchan->rx ? DMA_FROM_DEVICE :
-                        DMA_TO_DEVICE;
+                td_chan->direction = pchan->rx ? DMA_DEV_TO_MEM :
+                        DMA_MEM_TO_DEV;
 
                 td_chan->membase = td->membase +
                         (i / 2) * TIMBDMA_INSTANCE_OFFSET +