spi/xilinx: Simplify data read from the Rx FIFO

The number of words in the read buffer will be exactly the same as the
number of words written on write buffer, once the transaction has
finished.

Instead of cheking the rx_empty flags for every word simply save the
number of words written by fill_tx_fifo.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index e1d9a2003ae63ef7facb71b6e5fd421514bbc5b1..416b227eb30205221ca6bbd7c2f8a3029cdec7d6 100644 (file)
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -221,9 +221,10 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi,
        return 0;
 }
 
-static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi)
+static int xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi)
 {
        u8 sr;
+       int n_words = 0;
 
        /* Fill the Tx FIFO with as many bytes as possible */
        sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
@@ -234,7 +235,10 @@ static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi)
                        xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET);
                xspi->remaining_bytes -= xspi->bits_per_word / 8;
                sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
+               n_words++;
        }
+
+       return n_words;
 }
 
 static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
@@ -259,9 +263,9 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
 
        for (;;) {
                u16 cr;
-               u8 sr;
+               int n_words;
 
-               xilinx_spi_fill_tx_fifo(xspi);
+               n_words = xilinx_spi_fill_tx_fifo(xspi);
 
                /* Start the transfer by not inhibiting the transmitter any
                 * longer
@@ -282,11 +286,8 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
                               xspi->regs + XSPI_CR_OFFSET);
 
                /* Read out all the data from the Rx FIFO */
-               sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
-               while ((sr & XSPI_SR_RX_EMPTY_MASK) == 0) {
+               while (n_words--)
                        xspi->rx_fn(xspi);
-                       sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);
-               }
 
                /* See if there is more data to send */
                if (xspi->remaining_bytes <= 0)