spi: spi-imx: spi_imx_buf_rx_swap_u32(): replace open coded swahw32s()
authorMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 2 May 2022 17:54:53 +0000 (19:54 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 9 May 2022 17:18:12 +0000 (18:18 +0100)
This patch replaces an open coded swahw32s().

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/r/20220502175457.1977983-6-mkl@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-imx.c

index 86391f8..166d6b3 100644 (file)
@@ -290,17 +290,16 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
 static void spi_imx_buf_rx_swap_u32(struct spi_imx_data *spi_imx)
 {
        unsigned int val = readl(spi_imx->base + MXC_CSPIRXDATA);
-#ifdef __LITTLE_ENDIAN
-       unsigned int bytes_per_word;
-#endif
 
        if (spi_imx->rx_buf) {
 #ifdef __LITTLE_ENDIAN
+               unsigned int bytes_per_word;
+
                bytes_per_word = spi_imx_bytes_per_word(spi_imx->bits_per_word);
                if (bytes_per_word == 1)
                        swab32s(&val);
                else if (bytes_per_word == 2)
-                       val = (val << 16) | (val >> 16);
+                       swahw32s(&val);
 #endif
                *(u32 *)spi_imx->rx_buf = val;
                spi_imx->rx_buf += sizeof(u32);
@@ -356,7 +355,7 @@ static void spi_imx_buf_tx_swap_u32(struct spi_imx_data *spi_imx)
        if (bytes_per_word == 1)
                swab32s(&val);
        else if (bytes_per_word == 2)
-               val = (val << 16) | (val >> 16);
+               swahw32s(&val);
 #endif
        writel(val, spi_imx->base + MXC_CSPITXDATA);
 }