]> www.infradead.org Git - nvme.git/commitdiff
spi: omap2-mcspi: Use new spi_xfer_is_dma_mapped() helper
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 31 May 2024 19:42:36 +0000 (22:42 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 10 Jun 2024 11:49:00 +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-5-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-omap2-mcspi.c

index 7e3083b835348af45b49317f9bac53b39169caa3..b624cc472857eb55ea6f98c497ce865fedb688bb 100644 (file)
@@ -27,6 +27,8 @@
 
 #include <linux/spi/spi.h>
 
+#include "internals.h"
+
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
 #define OMAP2_MCSPI_MAX_FREQ           48000000
@@ -1208,8 +1210,7 @@ static int omap2_mcspi_transfer_one(struct spi_controller *ctlr,
                unsigned        count;
 
                if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
-                   ctlr->cur_msg_mapped &&
-                   ctlr->can_dma(ctlr, spi, t))
+                   spi_xfer_is_dma_mapped(ctlr, spi, t))
                        omap2_mcspi_set_fifo(spi, t, 1);
 
                omap2_mcspi_set_enable(spi, 1);
@@ -1220,8 +1221,7 @@ static int omap2_mcspi_transfer_one(struct spi_controller *ctlr,
                                        + OMAP2_MCSPI_TX0);
 
                if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
-                   ctlr->cur_msg_mapped &&
-                   ctlr->can_dma(ctlr, spi, t))
+                   spi_xfer_is_dma_mapped(ctlr, spi, t))
                        count = omap2_mcspi_txrx_dma(spi, t);
                else
                        count = omap2_mcspi_txrx_pio(spi, t);