From abb1ff195a21094f3bfb1cf8d425ff360d8a89ee Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 2 Jun 2017 07:37:59 +0200 Subject: [PATCH] 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 Signed-off-by: Mark Brown --- drivers/spi/spi-imx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index b402530..4b5cd0c 100644 --- 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; -- 2.7.4