Unverified Commit bd188666 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: qup: Use new spi_xfer_is_dma_mapped() helper 



Replace a few lines of code by calling a spi_xfer_is_dma_mapped() helper.

Signed-off-by: default avatarAndy 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-8-andriy.shevchenko@linux.intel.com


Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2f9485ad

drivers/spi/spi-qup.c

+4 −5
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/err.h>

#include <linux/interconnect.h>

#include <linux/interrupt.h>
@@ -16,8 +18,7 @@ 
#include <linux/pm_opp.h>

#include <linux/pm_runtime.h>

#include <linux/spi/spi.h>

#include <linux/dmaengine.h>

#include <linux/dma-mapping.h>

#include "internals.h"



#define QUP_CONFIG			0x0000

#define QUP_STATE			0x0004
@@ -709,9 +710,7 @@ static int spi_qup_io_prep(struct spi_device *spi, struct spi_transfer *xfer) 


	if (controller->n_words <= (controller->in_fifo_sz / sizeof(u32)))

		controller->mode = QUP_IO_M_MODE_FIFO;

	else if (spi->controller->can_dma &&

		 spi->controller->can_dma(spi->controller, spi, xfer) &&

		 spi->controller->cur_msg_mapped)

	else if (spi_xfer_is_dma_mapped(spi->controller, spi, xfer))

		controller->mode = QUP_IO_M_MODE_BAM;

	else

		controller->mode = QUP_IO_M_MODE_BLOCK;