spi: davinci: remove unnecessary 'count' variable in driver private data
The variable count in DaVinci SPI driver's private data is
largely unused and its minor use can easily be eliminated.
Remove the variable.
Signed-off-by: Brian Niebuhr <bniebuhr@efjohnson.com>
Tested-By: Michael Williamson <michael.williamson@criticallink.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 1169e8e..ad814f2 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -142,7 +142,6 @@
const void *tx;
void *rx;
u8 *tmp_buf;
- int count;
struct davinci_spi_dma *dma_channels;
struct davinci_spi_platform_data *pdata;
@@ -630,8 +629,6 @@
/* convert len to words based on bits_per_word */
conv = davinci_spi->bytes_per_word[spi->chip_select];
- davinci_spi->count = t->len / conv;
-
data1_reg_val = ioread32(davinci_spi->base + SPIDAT1);
INIT_COMPLETION(davinci_spi->done);
@@ -643,7 +640,7 @@
/* Enable SPI */
set_io_bits(davinci_spi->base + SPIGCR1, SPIGCR1_SPIENA_MASK);
- count = davinci_spi->count;
+ count = t->len / conv;
/* Determine the command to execute READ or WRITE */
if (t->tx_buf) {
@@ -699,7 +696,7 @@
} else { /* Receive in Interrupt mode */
int i;
- for (i = 0; i < davinci_spi->count; i++) {
+ for (i = 0; i < count; i++) {
set_io_bits(davinci_spi->base + SPIINT,
SPIINT_BITERR_INTR
| SPIINT_OVRRUN_INTR
@@ -754,7 +751,6 @@
/* convert len to words based on bits_per_word */
data_type = davinci_spi->bytes_per_word[spi->chip_select];
- davinci_spi->count = t->len / data_type;
data1_reg_val = ioread32(davinci_spi->base + SPIDAT1);
@@ -767,7 +763,7 @@
if (ret)
return ret;
- count = davinci_spi->count; /* the number of elements */
+ count = t->len / data_type; /* the number of elements */
/* disable all interrupts for dma transfers */
clear_io_bits(davinci_spi->base + SPIINT, SPIINT_MASKALL);