nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

spi: spi-fsl-dspi: Simplify bytes_per_word gymnastics

Browse source 
Reduce the if-then-else-if-then-else sequence to:
 - a simple division in the case of bytes_per_word calculation
 - a memcpy command with a variable size. The semantics of larger-than-8
   xfer->bits_per_word is that those words are to be interpreted and
   transmitted in CPU native endianness.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20200304220044.11193-2-olteanv@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vladimir Oltean 2020-03-05 00:00:33 +02:00 committed by Mark Brown
parent cb71d8efd7
commit 53fadb4d90
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 3 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/spi/spi-fsl-dspi.c
View file

@ -252,12 +252,7 @@ static u32 dspi_pop_tx(struct fsl_dspi *dspi)
u32 txdata = 0; u32 txdata = 0;
if (dspi->tx) { if (dspi->tx) {
if (dspi->bytes_per_word == 1) memcpy(&txdata, dspi->tx, dspi->bytes_per_word);
txdata = *(u8 *)dspi->tx;
else if (dspi->bytes_per_word == 2)
txdata = *(u16 *)dspi->tx;
else /* dspi->bytes_per_word == 4 */
txdata = *(u32 *)dspi->tx;
dspi->tx += dspi->bytes_per_word; dspi->tx += dspi->bytes_per_word;
} }
dspi->len -= dspi->bytes_per_word; dspi->len -= dspi->bytes_per_word;
@ -284,12 +279,7 @@ static void dspi_push_rx(struct fsl_dspi *dspi, u32 rxdata)
/* Mask off undefined bits */ /* Mask off undefined bits */
rxdata &= (1 << dspi->bits_per_word) - 1; rxdata &= (1 << dspi->bits_per_word) - 1;
if (dspi->bytes_per_word == 1) memcpy(dspi->rx, &rxdata, dspi->bytes_per_word);
*(u8 *)dspi->rx = rxdata;
else if (dspi->bytes_per_word == 2)
*(u16 *)dspi->rx = rxdata;
else /* dspi->bytes_per_word == 4 */
*(u32 *)dspi->rx = rxdata;
dspi->rx += dspi->bytes_per_word; dspi->rx += dspi->bytes_per_word;
} }
@ -814,12 +804,7 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,
dspi->progress = 0; dspi->progress = 0;
/* Validated transfer specific frame size (defaults applied) */ /* Validated transfer specific frame size (defaults applied) */
dspi->bits_per_word = transfer->bits_per_word; dspi->bits_per_word = transfer->bits_per_word;
if (transfer->bits_per_word <= 8) dspi->bytes_per_word = DIV_ROUND_UP(dspi->bits_per_word, 8);
dspi->bytes_per_word = 1;
else if (transfer->bits_per_word <= 16)
dspi->bytes_per_word = 2;
else
dspi->bytes_per_word = 4;
regmap_update_bits(dspi->regmap, SPI_MCR, regmap_update_bits(dspi->regmap, SPI_MCR,
SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF, SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF,