]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
spi: imx: Drop unnecessary check
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 2 Jun 2017 05:38:00 +0000 (07:38 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jun 2017 18:48:23 +0000 (19:48 +0100)
__spi_validate makes sure that every transfer has a valid bits_per_word
and speed_hz setting. We do not need to fallback to values from the
spi_device.

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

index 4b5cd0c84450398690c4cae3270e96f99c05158b..e3bc3d51a2d680bd62dba3c7e88d51cc102344a3 100644 (file)
@@ -218,8 +218,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
                return false;
 
        bpw = transfer->bits_per_word;
-       if (!bpw)
-               bpw = spi->bits_per_word;
 
        bpw = spi_imx_bytes_per_word(bpw);
 
@@ -898,11 +896,6 @@ static int spi_imx_setupxfer(struct spi_device *spi,
        config.bpw = t->bits_per_word;
        config.speed_hz  = t->speed_hz;
 
-       if (!config.speed_hz)
-               config.speed_hz = spi->max_speed_hz;
-       if (!config.bpw)
-               config.bpw = spi->bits_per_word;
-
        /* Initialize the functions for transfer */
        if (config.bpw <= 8) {
                spi_imx->rx = spi_imx_buf_rx_u8;