]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: pxa2xx: Use new spi_xfer_is_dma_mapped() helper
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 31 May 2024 19:42:37 +0000 (22:42 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 10 Jun 2024 11:49:01 +0000 (12:49 +0100)
Replace a few lines of code by calling a spi_xfer_is_dma_mapped() helper.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-QRD
Link: https://lore.kernel.org/r/20240531194723.1761567-6-andriy.shevchenko@linux.intel.com
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Tested-by: NĂ­colas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-pxa2xx.c

index 1fb30201459fb33308b5d5a9657b829c6162fcd7..16b96eb176cd9db72e176fb3b8bc4bdb60999fff 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <linux/spi/spi.h>
 
+#include "internals.h"
 #include "spi-pxa2xx.h"
 
 #define TIMOUT_DFLT            1000
@@ -993,11 +994,8 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,
        }
 
        dma_thresh = SSCR1_RxTresh(RX_THRESH_DFLT) | SSCR1_TxTresh(TX_THRESH_DFLT);
-       dma_mapped = controller->can_dma &&
-                    controller->can_dma(controller, spi, transfer) &&
-                    controller->cur_msg_mapped;
+       dma_mapped = spi_xfer_is_dma_mapped(controller, spi, transfer);
        if (dma_mapped) {
-
                /* Ensure we have the correct interrupt handler */
                drv_data->transfer_handler = pxa2xx_spi_dma_transfer;