7 files changed, 14 insertions, 21 deletions

diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index 8418eb036651..b9f0192758d6 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
+#include <linux/types.h>
 
 #include "spi-dw.h"
 
@@ -136,6 +137,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         txconf.dst_maxburst = LNW_DMA_MSIZE_16;
         txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
         txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+        txconf.device_fc = false;
 
         txchan->device->device_control(txchan, DMA_SLAVE_CONFIG,
                                        (unsigned long) &txconf);
@@ -144,7 +146,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         dws->tx_sgl.dma_address = dws->tx_dma;
         dws->tx_sgl.length = dws->len;
 
-        txdesc = txchan->device->device_prep_slave_sg(txchan,
+        txdesc = dmaengine_prep_slave_sg(txchan,
                                 &dws->tx_sgl,
                                 1,
                                 DMA_MEM_TO_DEV,
@@ -158,6 +160,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         rxconf.src_maxburst = LNW_DMA_MSIZE_16;
         rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
         rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+        rxconf.device_fc = false;
 
         rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG,
                                        (unsigned long) &rxconf);
@@ -166,7 +169,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
         dws->rx_sgl.dma_address = dws->rx_dma;
         dws->rx_sgl.length = dws->len;
 
-        rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
+        rxdesc = dmaengine_prep_slave_sg(rxchan,
                                 &dws->rx_sgl,
                                 1,
                                 DMA_DEV_TO_MEM,
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 082458d73ce9..d1a495f64e2d 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -63,12 +63,6 @@ struct chip_data {
 };
 
 #ifdef CONFIG_DEBUG_FS
-static int spi_show_regs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 #define SPI_REGS_BUFSIZE        1024
 static ssize_t  spi_show_regs(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
@@ -128,7 +122,7 @@ static ssize_t  spi_show_regs(struct file *file, char __user *user_buf,
 
 static const struct file_operations mrst_spi_regs_ops = {
         .owner          = THIS_MODULE,
-        .open           = spi_show_regs_open,
+        .open           = simple_open,
         .read           = spi_show_regs,
         .llseek         = default_llseek,
 };
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index d46e55c720b7..6db2887852d6 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -633,8 +633,8 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)
         if (!nents)
                 return ERR_PTR(-ENOMEM);
 
-        txd = chan->device->device_prep_slave_sg(chan, sgt->sgl, nents,
-                                                 slave_dirn, DMA_CTRL_ACK);
+        txd = dmaengine_prep_slave_sg(chan, sgt->sgl, nents,
+                                        slave_dirn, DMA_CTRL_ACK);
         if (!txd) {
                 dma_unmap_sg(chan->device->dev, sgt->sgl, sgt->nents, dir);
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 610f7391456e..9b0d71696039 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -47,7 +47,6 @@
 #include <linux/spi/spi_bitbang.h>
 #include <linux/module.h>
 
-#include <asm/system.h>
 #include <asm/irq.h>
 #include <mach/hardware.h>
 #include <asm/io.h>
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 13448c832c44..e496f799b7a9 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -359,11 +359,6 @@ static int orion_spi_setup(struct spi_device *spi)
 
         orion_spi = spi_master_get_devdata(spi->master);
 
-        /* Fix ac timing if required.   */
-        if (orion_spi->spi_info->enable_clock_fix)
-                orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
-                                  (1 << 14));
-
         if ((spi->max_speed_hz == 0)
                         || (spi->max_speed_hz > orion_spi->max_speed))
                 spi->max_speed_hz = orion_spi->max_speed;
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index dc8485d1e883..96f0da66b185 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -880,10 +880,12 @@ static int configure_dma(struct pl022 *pl022)
         struct dma_slave_config rx_conf = {
                 .src_addr = SSP_DR(pl022->phybase),
                 .direction = DMA_DEV_TO_MEM,
+                .device_fc = false,
         };
         struct dma_slave_config tx_conf = {
                 .dst_addr = SSP_DR(pl022->phybase),
                 .direction = DMA_MEM_TO_DEV,
+                .device_fc = false,
         };
         unsigned int pages;
         int ret;
@@ -1017,7 +1019,7 @@ static int configure_dma(struct pl022 *pl022)
                 goto err_tx_sgmap;
 
         /* Send both scatterlists */
-        rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
+        rxdesc = dmaengine_prep_slave_sg(rxchan,
                                       pl022->sgt_rx.sgl,
                                       rx_sglen,
                                       DMA_DEV_TO_MEM,
@@ -1025,7 +1027,7 @@ static int configure_dma(struct pl022 *pl022)
         if (!rxdesc)
                 goto err_rxdesc;
 
-        txdesc = txchan->device->device_prep_slave_sg(txchan,
+        txdesc = dmaengine_prep_slave_sg(txchan,
                                       pl022->sgt_tx.sgl,
                                       tx_sglen,
                                       DMA_MEM_TO_DEV,
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 5c6fa5ed3366..ec47d3bdfd13 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1099,7 +1099,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
                 sg_dma_address(sg) = dma->rx_buf_dma + sg->offset;
         }
         sg = dma->sg_rx_p;
-        desc_rx = dma->chan_rx->device->device_prep_slave_sg(dma->chan_rx, sg,
+        desc_rx = dmaengine_prep_slave_sg(dma->chan_rx, sg,
                                         num, DMA_DEV_TO_MEM,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc_rx) {
@@ -1158,7 +1158,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
                 sg_dma_address(sg) = dma->tx_buf_dma + sg->offset;
         }
         sg = dma->sg_tx_p;
-        desc_tx = dma->chan_tx->device->device_prep_slave_sg(dma->chan_tx,
+        desc_tx = dmaengine_prep_slave_sg(dma->chan_tx,
                                         sg, num, DMA_MEM_TO_DEV,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc_tx) {