spi: dw: Refactor mid_spi_dma_setup() to separate DMA and IRQ config

It's better to understand what bits are set for DMA and for IRQ handling
in mid_spi_dma_setup() if they are grouped accordingly. Thus,
refactor mid_spi_dma_setup() to separate DMA and IRQ configuration.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200529183150.44149-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-dw-dma.c b/drivers/spi/spi-dw-dma.c
index 53d5257662e8c88270e8b1d356a136866844e66b..5986c520b19655e3c0f40c3ccf843a15ecff8b51 100644 (file)
--- a/drivers/spi/spi-dw-dma.c
+++ b/drivers/spi/spi-dw-dma.c
@@ -375,17 +375,17 @@ static int dw_spi_dma_setup(struct dw_spi *dws, struct spi_transfer *xfer)
        dw_writel(dws, DW_SPI_DMARDLR, dws->rxburst - 1);
        dw_writel(dws, DW_SPI_DMATDLR, dws->fifo_len - dws->txburst);
 
-       if (xfer->tx_buf) {
+       if (xfer->tx_buf)
                dma_ctrl |= SPI_DMA_TDMAE;
-               imr |= SPI_INT_TXOI;
-       }
-       if (xfer->rx_buf) {
+       if (xfer->rx_buf)
                dma_ctrl |= SPI_DMA_RDMAE;
-               imr |= SPI_INT_RXUI | SPI_INT_RXOI;
-       }
        dw_writel(dws, DW_SPI_DMACR, dma_ctrl);
 
        /* Set the interrupt mask */
+       if (xfer->tx_buf)
+               imr |= SPI_INT_TXOI;
+       if (xfer->rx_buf)
+               imr |= SPI_INT_RXUI | SPI_INT_RXOI;
        spi_umask_intr(dws, imr);
 
        reinit_completion(&dws->dma_completion);