Skip to content

Commit

Permalink
spi: dw: get TX level without an additional variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
andy-shev authored and broonie committed Feb 24, 2015
1 parent 39bc03b commit ea11370
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/spi/spi-dw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down

0 comments on commit ea11370

Please sign in to comment.