diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 424a20b7576e..ee727fa7bc75 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -461,14 +461,10 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi,
 
 	dmaengine_slave_config(mcspi_dma->dma_tx, &cfg);
 
-	if (mcspi->use_eow_interrupt)
-		tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
-					     xfer->tx_sg.nents, DMA_MEM_TO_DEV,
-					     DMA_CTRL_ACK);
-	else
-		tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
-					     xfer->tx_sg.nents, DMA_MEM_TO_DEV,
-					     DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+	unsigned long flags = mcspi->use_eow_interrupt ? DMA_CTRL_ACK
+						       : (DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+	tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
+				     xfer->tx_sg.nents, DMA_MEM_TO_DEV, flags);
 
 	if (tx) {
 		if (!mcspi->use_eow_interrupt) {
@@ -555,14 +551,10 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer,
 		return 0;
 	}
 
-	if (mcspi->use_eow_interrupt)
-		tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, sg_out[0],
-					     out_mapped_nents[0], DMA_DEV_TO_MEM,
-					     DMA_CTRL_ACK);
-	else
-		tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, sg_out[0],
-					     out_mapped_nents[0], DMA_DEV_TO_MEM,
-					     DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+	unsigned long flags = mcspi->use_eow_interrupt ? DMA_CTRL_ACK
+						       : (DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+	tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
+				     xfer->tx_sg.nents, DMA_MEM_TO_DEV, flags);
 
 	if (tx) {
 		if (!mcspi->use_eow_interrupt) {