diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-02-24 13:32:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-24 23:43:34 +0900 |
| commit | ea11370fffdfedbd0cca0fce17907d2c993246bc (patch) | |
| tree | f21a1e072b1f238c2ce5ed30c8d820c82b69d428 /drivers/spi/spi-dw.c | |
| parent | 39bc03bfecab38e7532449d54aeef3db817084af (diff) | |
| download | linux-ea11370fffdfedbd0cca0fce17907d2c993246bc.tar.gz linux-ea11370fffdfedbd0cca0fce17907d2c993246bc.tar.bz2 linux-ea11370fffdfedbd0cca0fce17907d2c993246bc.zip | |
spi: dw: get TX level without an additional variable
There is no need to have an additional variable to get a TX level. The patch
refactors this piece of code.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-dw.c')
| -rw-r--r-- | drivers/spi/spi-dw.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 29157f00f45a..0febb97ae32f 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -365,7 +365,7 @@ static void pump_transfers(unsigned long data) u8 bits = 0; u8 imask = 0; u8 cs_change = 0; - u16 txint_level = 0; + u16 txlevel = 0; u16 clk_div = 0; u32 speed = 0; u32 cr0 = 0; @@ -461,10 +461,7 @@ static void pump_transfers(unsigned long data) * we only need set the TXEI IRQ, as TX/RX always happen syncronizely */ if (!dws->dma_mapped && !chip->poll_mode) { - int templen = dws->len / dws->n_bytes; - - txint_level = dws->fifo_len / 2; - txint_level = (templen > txint_level) ? txint_level : templen; + txlevel = min_t(u16, dws->fifo_len / 2, dws->len / dws->n_bytes); imask |= SPI_INT_TXEI | SPI_INT_TXOI | SPI_INT_RXUI | SPI_INT_RXOI; @@ -490,8 +487,8 @@ static void pump_transfers(unsigned long data) spi_mask_intr(dws, 0xff); if (imask) spi_umask_intr(dws, imask); - if (txint_level) - dw_writew(dws, DW_SPI_TXFLTR, txint_level); + if (txlevel) + dw_writew(dws, DW_SPI_TXFLTR, txlevel); spi_enable_chip(dws, 1); } |