SPI: remove superfluous DMA buffer syncs on PL022

Commit Message

Linus Walleij Aug. 17, 2010, 10:08 p.m. UTC

None

Patch

diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index 59b3948..521d3d9 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -794,12 +794,7 @@  static void dma_callback(void *data)
 	struct pl022 *pl022 = data;
 	struct spi_message *msg = pl022->cur_msg;
 
-	/* Sync in RX buffer to CPU */
 	BUG_ON(!pl022->sgt_rx.sgl);
-	dma_sync_sg_for_cpu(&pl022->adev->dev,
-			    pl022->sgt_rx.sgl,
-			    pl022->sgt_rx.nents,
-			    DMA_FROM_DEVICE);
 
 #ifdef VERBOSE_DEBUG
 	/*
@@ -812,6 +807,11 @@  static void dma_callback(void *data)
 		struct scatterlist *sg;
 		unsigned int i;
 
+		dma_sync_sg_for_cpu(&pl022->adev->dev,
+				    pl022->sgt_rx.sgl,
+				    pl022->sgt_rx.nents,
+				    DMA_FROM_DEVICE);
+
 		for_each_sg(pl022->sgt_rx.sgl, sg, pl022->sgt_rx.nents, i) {
 			dev_dbg(&pl022->adev->dev, "SPI RX SG ENTRY: %d", i);
 			print_hex_dump(KERN_ERR, "SPI RX: ",
@@ -1001,12 +1001,6 @@  static int configure_dma(struct pl022 *pl022)
 	if (sglen != pages)
 		goto err_tx_sgmap;
 
-	/* Synchronize the TX scatterlist, invalidate buffers, caches etc */
-	dma_sync_sg_for_device(&pl022->adev->dev,
-			       pl022->sgt_tx.sgl,
-			       pl022->sgt_tx.nents,
-			       DMA_TO_DEVICE);
-
 	/* Send both scatterlists */
 	rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
 				      pl022->sgt_rx.sgl,