]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: a3700: Remove endianness swapping functions when accessing FIFOs
authorMaxime Chevallier <maxime.chevallier@smile.fr>
Wed, 24 Jan 2018 14:10:47 +0000 (15:10 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 24 Jan 2018 15:03:13 +0000 (15:03 +0000)
Fixes the following sparse warnings :
line 504: warning: incorrect type in assignment (different base types)
line 504:    expected unsigned int [unsigned] [usertype] val
line 504:    got restricted __le32 [usertype] <noident>
line 527: warning: cast to restricted __le32

This is solved by removing endian-converson functions, since the
converted values are going through readl/writel anyway, which take care
of the conversion.

Fixes: 6fd6fd68c9e2 ("spi: armada-3700: Fix padding when sending not 4-byte aligned data")
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>
drivers/spi/spi-armada-3700.c

index fdc35dabcda2623bb1c06f82b19ca0a1c7128001..f32b83c7209f2efb6c90ff5af53da14eedbd6b5f 100644 (file)
@@ -493,7 +493,7 @@ static int a3700_spi_fifo_write(struct a3700_spi *a3700_spi)
        u32 val;
 
        while (!a3700_is_wfifo_full(a3700_spi) && a3700_spi->buf_len) {
-               val = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
+               val = *(u32 *)a3700_spi->tx_buf;
                spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
                a3700_spi->buf_len -= 4;
                a3700_spi->tx_buf += 4;
@@ -516,9 +516,8 @@ static int a3700_spi_fifo_read(struct a3700_spi *a3700_spi)
        while (!a3700_is_rfifo_empty(a3700_spi) && a3700_spi->buf_len) {
                val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
                if (a3700_spi->buf_len >= 4) {
-                       u32 data = le32_to_cpu(val);
 
-                       memcpy(a3700_spi->rx_buf, &data, 4);
+                       memcpy(a3700_spi->rx_buf, &val, 4);
 
                        a3700_spi->buf_len -= 4;
                        a3700_spi->rx_buf += 4;