diff options
author | Maxime Chevallier <maxime.chevallier@smile.fr> | 2018-01-24 09:10:48 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-24 10:03:31 -0500 |
commit | 34b1fcaeb21de2a64004a95a1dc52d7e9998b733 (patch) | |
tree | d529ad542665292b1f2eb601980069ce222e8b88 | |
parent | 162f8debc01f48ac984ed6d7291743053ec90271 (diff) |
spi: a3700: Remove endianness swapping for full-duplex transfers
Fixes the following sparse warnings :
line 767: warning: incorrect type in assignment (different base types)
line 767: expected unsigned int [unsigned] [assigned] [usertype] val_out
line 767: got restricted __le32 [usertype] <noident>
line 776: warning: cast to restricted __le32
This takes advantage of readl/writel to do the endianness reordering,
and removes an extra variable in the function.
Fixes: f68a7dcb91b7 ("spi: a3700: Add full-duplex support")
Signed-off-by: Maxime Chevallier <maxime.chevallier@smile.fr>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-armada-3700.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c index f32b83c7209f..1f42bd04e630 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c | |||
@@ -739,7 +739,7 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master, | |||
739 | struct spi_transfer *xfer) | 739 | struct spi_transfer *xfer) |
740 | { | 740 | { |
741 | struct a3700_spi *a3700_spi = spi_master_get_devdata(master); | 741 | struct a3700_spi *a3700_spi = spi_master_get_devdata(master); |
742 | u32 val_in, val_out; | 742 | u32 val; |
743 | 743 | ||
744 | /* Disable FIFO mode */ | 744 | /* Disable FIFO mode */ |
745 | a3700_spi_fifo_mode_set(a3700_spi, false); | 745 | a3700_spi_fifo_mode_set(a3700_spi, false); |
@@ -753,21 +753,20 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master, | |||
753 | a3700_spi_bytelen_set(a3700_spi, 1); | 753 | a3700_spi_bytelen_set(a3700_spi, 1); |
754 | 754 | ||
755 | if (a3700_spi->byte_len == 1) | 755 | if (a3700_spi->byte_len == 1) |
756 | val_out = *a3700_spi->tx_buf; | 756 | val = *a3700_spi->tx_buf; |
757 | else | 757 | else |
758 | val_out = cpu_to_le32(*(u32 *)a3700_spi->tx_buf); | 758 | val = *(u32 *)a3700_spi->tx_buf; |
759 | 759 | ||
760 | spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val_out); | 760 | spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val); |
761 | 761 | ||
762 | /* Wait for all the data to be shifted in / out */ | 762 | /* Wait for all the data to be shifted in / out */ |
763 | while (!(spireg_read(a3700_spi, A3700_SPI_IF_CTRL_REG) & | 763 | while (!(spireg_read(a3700_spi, A3700_SPI_IF_CTRL_REG) & |
764 | A3700_SPI_XFER_DONE)) | 764 | A3700_SPI_XFER_DONE)) |
765 | cpu_relax(); | 765 | cpu_relax(); |
766 | 766 | ||
767 | val_in = le32_to_cpu(spireg_read(a3700_spi, | 767 | val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG); |
768 | A3700_SPI_DATA_IN_REG)); | ||
769 | 768 | ||
770 | memcpy(a3700_spi->rx_buf, &val_in, a3700_spi->byte_len); | 769 | memcpy(a3700_spi->rx_buf, &val, a3700_spi->byte_len); |
771 | 770 | ||
772 | a3700_spi->buf_len -= a3700_spi->byte_len; | 771 | a3700_spi->buf_len -= a3700_spi->byte_len; |
773 | a3700_spi->tx_buf += a3700_spi->byte_len; | 772 | a3700_spi->tx_buf += a3700_spi->byte_len; |