Blackfin SPI Driver: use the properl BIT_CTL_xxx defines

use the properl BIT_CTL_...  defines rather than the internal driv er
CFG_SPI_...  defines

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 5ebb67b011d05a944b01453b4b77a15dc650baea..1c10efb120db17642fa8191ebadc48ff88fd45d8 100644 (file)
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -799,7 +799,7 @@ static void pump_transfers(unsigned long data)
 
                        /* start SPI transfer */
                        write_CTRL(drv_data,
-                               (cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
+                               (cr | BIT_CTL_TIMOD_DMA_TX | BIT_CTL_ENABLE));
 
                        /* just return here, there can only be one transfer
                         * in this mode
@@ -827,7 +827,7 @@ static void pump_transfers(unsigned long data)
 
                        dma_config |= WNR;
                        dma_start_addr = (unsigned long)drv_data->rx;
-                       cr |= CFG_SPI_DMAREAD;
+                       cr |= BIT_CTL_TIMOD_DMA_RX | BIT_CTL_SENDOPT;
 
                } else if (drv_data->tx != NULL) {
                        dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
@@ -839,7 +839,7 @@ static void pump_transfers(unsigned long data)
                                                drv_data->len_in_bytes));
 
                        dma_start_addr = (unsigned long)drv_data->tx;
-                       cr |= CFG_SPI_DMAWRITE;
+                       cr |= BIT_CTL_TIMOD_DMA_TX;
 
                } else
                        BUG();