spi: imx: Nothing to do in setupxfer when transfer is NULL

When the spi_transfer given in spi_imx_setupxfer is NULL then
we have nothing to do. Bail out early in this case so that
we do not have to test for t != NULL multiple times later.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index b402530a7a9a94d6ed4d7e836c3da67b8a645f3f..4b5cd0c84450398690c4cae3270e96f99c05158b 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -217,9 +217,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
        if (!master->dma_rx)
                return false;
 
-       if (!transfer)
-               return false;
-
        bpw = transfer->bits_per_word;
        if (!bpw)
                bpw = spi->bits_per_word;
@@ -895,8 +892,11 @@ static int spi_imx_setupxfer(struct spi_device *spi,
        struct spi_imx_config config;
        int ret;
 
-       config.bpw = t ? t->bits_per_word : spi->bits_per_word;
-       config.speed_hz  = t ? t->speed_hz : spi->max_speed_hz;
+       if (!t)
+               return 0;
+
+       config.bpw = t->bits_per_word;
+       config.speed_hz  = t->speed_hz;
 
        if (!config.speed_hz)
                config.speed_hz = spi->max_speed_hz;