evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi/xilinx: Remove remaining_words driver data variable

Browse source 
The variable never leaves the scope of txrx_bufs.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ricardo Ribalda Delgado 2015-01-28 13:23:52 +01:00 • committed by Mark Brown
parent 99082eab63
commit b563bfb8d7
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/spi/spi-xilinx.c
View file

@ -86,7 +86,6 @@ struct xilinx_spi {
u8 *rx_ptr; /* pointer in the Tx buffer */ u8 *rx_ptr; /* pointer in the Tx buffer */
const u8 *tx_ptr; /* pointer in the Rx buffer */ const u8 *tx_ptr; /* pointer in the Rx buffer */
int remaining_words; /* the number of words left to transfer */
u8 bytes_per_word; u8 bytes_per_word;
int buffer_size; /* buffer size in words */ int buffer_size; /* buffer size in words */
u32 cs_inactive; /* Level of the CS pins when inactive*/ u32 cs_inactive; /* Level of the CS pins when inactive*/
@ -209,33 +208,27 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi,
return 0; return 0;
} }
static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words)
{
xspi->remaining_words -= n_words;
while (n_words--)
xilinx_spi_tx(xspi);
return;
}
static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
{ {
struct xilinx_spi *xspi = spi_master_get_devdata(spi->master); struct xilinx_spi *xspi = spi_master_get_devdata(spi->master);
int remaining_words; /* the number of words left to transfer */
/* We get here with transmitter inhibited */ /* We get here with transmitter inhibited */
xspi->tx_ptr = t->tx_buf; xspi->tx_ptr = t->tx_buf;
xspi->rx_ptr = t->rx_buf; xspi->rx_ptr = t->rx_buf;
xspi->remaining_words = t->len / xspi->bytes_per_word; remaining_words = t->len / xspi->bytes_per_word;
reinit_completion(&xspi->done); reinit_completion(&xspi->done);
while (xspi->remaining_words) { while (remaining_words) {
u16 cr = 0; u16 cr = 0;
int n_words; int n_words, tx_words, rx_words;
n_words = min(xspi->remaining_words, xspi->buffer_size); n_words = min(remaining_words, xspi->buffer_size);
xilinx_spi_fill_tx_fifo(xspi, n_words); tx_words = n_words;
while (tx_words--)
xilinx_spi_tx(xspi);
/* Start the transfer by not inhibiting the transmitter any /* Start the transfer by not inhibiting the transmitter any
* longer * longer
@ -261,8 +254,11 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
xspi->regs + XSPI_CR_OFFSET); xspi->regs + XSPI_CR_OFFSET);
/* Read out all the data from the Rx FIFO */ /* Read out all the data from the Rx FIFO */
while (n_words--) rx_words = n_words;
while (rx_words--)
xilinx_spi_rx(xspi); xilinx_spi_rx(xspi);
remaining_words -= n_words;
} }
return t->len; return t->len;