spi: Compatibility with direction which is used in samsung DMA operation

I found that there are two kind of direction type.
First one is dma_data_direction defined in include/linux/dma-direction.h.
It is used for parameter of dma_map/unmap_single in spi-s3c64xx.
The other one is dma_transter_direction defined in include/linux/dmaengine.h.
It is used for direction of samsung DMA operation
(arch/arm/plat-samsung/dma-ops.c).
This patch is just some changes to use direction defines
which is used in samsung DMA operation.

Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Kyoungil Kim <ki0351.kim@samsung.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 1174d80..c40d118 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -236,7 +236,7 @@ static void s3c64xx_spi_dmacb(void *data)
        struct s3c64xx_spi_dma_data *dma = data;
        unsigned long flags;
 
-       if (dma->direction == DMA_FROM_DEVICE)
+       if (dma->direction == DMA_DEV_TO_MEM)
                sdd = container_of(data,
                        struct s3c64xx_spi_driver_data, rx_dma);
        else
@@ -245,7 +245,7 @@ static void s3c64xx_spi_dmacb(void *data)
 
        spin_lock_irqsave(&sdd->lock, flags);
 
-       if (dma->direction == DMA_FROM_DEVICE) {
+       if (dma->direction == DMA_DEV_TO_MEM) {
                sdd->state &= ~RXBUSY;
                if (!(sdd->state & TXBUSY))
                        complete(&sdd->xfer_completion);
@@ -264,7 +264,7 @@ static void prepare_dma(struct s3c64xx_spi_dma_data *dma,
        struct s3c64xx_spi_driver_data *sdd;
        struct samsung_dma_prep_info info;
 
-       if (dma->direction == DMA_FROM_DEVICE)
+       if (dma->direction == DMA_DEV_TO_MEM) {
                sdd = container_of((void *)dma,
                        struct s3c64xx_spi_driver_data, rx_dma);
        else
@@ -1012,9 +1012,9 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
        sdd->pdev = pdev;
        sdd->sfr_start = mem_res->start;
        sdd->tx_dma.dmach = dmatx_res->start;
-       sdd->tx_dma.direction = DMA_TO_DEVICE;
+       sdd->tx_dma.direction = DMA_MEM_TO_DEV;
        sdd->rx_dma.dmach = dmarx_res->start;
-       sdd->rx_dma.direction = DMA_FROM_DEVICE;
+       sdd->rx_dma.direction = DMA_DEV_TO_MEM;
 
        sdd->cur_bpw = 8;