spi: fsl: remove is_dma_mapped checks

There are no more peripheral drivers that set t->tx_dma or t->rx_dma.
Therefore, is_dma_mapped is always false and can be removed.

Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://msgid.link/r/20240328-spi-more-tx-rx-buf-cleanup-v1-2-9ec1ceedf08c@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c
index 47c7a5c6257ff831cb567e1746f715964788bdee..e335132080bf95103b0f517342b26d4251f4c370 100644 (file)
--- a/drivers/spi/spi-fsl-cpm.c
+++ b/drivers/spi/spi-fsl-cpm.c
@@ -98,19 +98,13 @@ static void fsl_spi_cpm_bufs_start(struct mpc8xxx_spi *mspi)
        mpc8xxx_spi_write_reg(&reg_base->command, SPCOM_STR);
 }
 
-int fsl_spi_cpm_bufs(struct mpc8xxx_spi *mspi,
-                    struct spi_transfer *t, bool is_dma_mapped)
+int fsl_spi_cpm_bufs(struct mpc8xxx_spi *mspi, struct spi_transfer *t)
 {
        struct device *dev = mspi->dev;
        struct fsl_spi_reg __iomem *reg_base = mspi->reg_base;
 
-       if (is_dma_mapped) {
-               mspi->map_tx_dma = 0;
-               mspi->map_rx_dma = 0;
-       } else {
-               mspi->map_tx_dma = 1;
-               mspi->map_rx_dma = 1;
-       }
+       mspi->map_tx_dma = 1;
+       mspi->map_rx_dma = 1;
 
        if (!t->tx_buf) {
                mspi->tx_dma = mspi->dma_dummy_tx;
@@ -147,7 +141,7 @@ int fsl_spi_cpm_bufs(struct mpc8xxx_spi *mspi,
                        return -ENOMEM;
                }
        } else if (t->tx_buf) {
-               mspi->tx_dma = t->tx_dma;
+               mspi->tx_dma = 0;
        }
 
        if (mspi->map_rx_dma) {

diff --git a/drivers/spi/spi-fsl-cpm.h b/drivers/spi/spi-fsl-cpm.h
index 160f999708b691b9e9ff4ad03787c8486f4a9374..e012abba055f4862c41675e5ea27bea270445c42 100644 (file)
--- a/drivers/spi/spi-fsl-cpm.h
+++ b/drivers/spi/spi-fsl-cpm.h
@@ -20,7 +20,7 @@
 #ifdef CONFIG_FSL_SOC
 extern void fsl_spi_cpm_reinit_txrx(struct mpc8xxx_spi *mspi);
 extern int fsl_spi_cpm_bufs(struct mpc8xxx_spi *mspi,
-                           struct spi_transfer *t, bool is_dma_mapped);
+                           struct spi_transfer *t);
 extern void fsl_spi_cpm_bufs_complete(struct mpc8xxx_spi *mspi);
 extern void fsl_spi_cpm_irq(struct mpc8xxx_spi *mspi, u32 events);
 extern int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi);
@@ -28,8 +28,7 @@ extern void fsl_spi_cpm_free(struct mpc8xxx_spi *mspi);
 #else
 static inline void fsl_spi_cpm_reinit_txrx(struct mpc8xxx_spi *mspi) { }
 static inline int fsl_spi_cpm_bufs(struct mpc8xxx_spi *mspi,
-                                  struct spi_transfer *t,
-                                  bool is_dma_mapped) { return 0; }
+                                  struct spi_transfer *t) { return 0; }
 static inline void fsl_spi_cpm_bufs_complete(struct mpc8xxx_spi *mspi) { }
 static inline void fsl_spi_cpm_irq(struct mpc8xxx_spi *mspi, u32 events) { }
 static inline int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) { return 0; }

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 97faf984801f95cc1a11017280962adf4d5dd73b..997e07c0a24aa9d59b5b733d17f2e6d38dc54e78 100644 (file)
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -249,8 +249,7 @@ static int fsl_spi_cpu_bufs(struct mpc8xxx_spi *mspi,
        return 0;
 }
 
-static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t,
-                           bool is_dma_mapped)
+static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
 {
        struct mpc8xxx_spi *mpc8xxx_spi = spi_controller_get_devdata(spi->controller);
        struct fsl_spi_reg __iomem *reg_base;
@@ -274,7 +273,7 @@ static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t,
        reinit_completion(&mpc8xxx_spi->done);
 
        if (mpc8xxx_spi->flags & SPI_CPM_MODE)
-               ret = fsl_spi_cpm_bufs(mpc8xxx_spi, t, is_dma_mapped);
+               ret = fsl_spi_cpm_bufs(mpc8xxx_spi, t);
        else
                ret = fsl_spi_cpu_bufs(mpc8xxx_spi, t, len);
        if (ret)
@@ -353,7 +352,7 @@ static int fsl_spi_transfer_one(struct spi_controller *controller,
        if (status < 0)
                return status;
        if (t->len)
-               status = fsl_spi_bufs(spi, t, !!t->tx_dma || !!t->rx_dma);
+               status = fsl_spi_bufs(spi, t);
        if (status > 0)
                return -EMSGSIZE;