spi: imx: Drop unnecessary check

[linux-2.6-block.git] / drivers / spi / spi-imx.c

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index b402530a7a9a94d6ed4d7e836c3da67b8a645f3f..e3bc3d51a2d680bd62dba3c7e88d51cc102344a3 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -217,12 +217,7 @@ 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;
 
        bpw = spi_imx_bytes_per_word(bpw);
 
@@ -895,13 +890,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;
 
-       if (!config.speed_hz)
-               config.speed_hz = spi->max_speed_hz;
-       if (!config.bpw)
-               config.bpw = spi->bits_per_word;
+       config.bpw = t->bits_per_word;
+       config.speed_hz  = t->speed_hz;
 
        /* Initialize the functions for transfer */
        if (config.bpw <= 8) {