From: Sascha Hauer Date: Fri, 2 Jun 2017 05:38:00 +0000 (+0200) Subject: spi: imx: Drop unnecessary check X-Git-Tag: v4.13-rc1~175^2~3^5~5 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=494f3193bd8ca6a15a813bf0f8b5552ec0d173f3;p=linux-2.6-block.git spi: imx: Drop unnecessary check __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 Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 4b5cd0c84450..e3bc3d51a2d6 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -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;