summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-02 07:38:00 +0200
committerMark Brown <broonie@kernel.org>2017-06-06 19:48:23 +0100
commit494f3193bd8ca6a15a813bf0f8b5552ec0d173f3 (patch)
treef90fb47588d2ad40f810d94989849e02ec7c2fbb /drivers/spi/spi-imx.c
parentabb1ff195a21094f3bfb1cf8d425ff360d8a89ee (diff)
downloadlinux-stable-494f3193bd8ca6a15a813bf0f8b5552ec0d173f3.tar.gz
linux-stable-494f3193bd8ca6a15a813bf0f8b5552ec0d173f3.tar.bz2
linux-stable-494f3193bd8ca6a15a813bf0f8b5552ec0d173f3.zip
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 <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-imx.c')
-rw-r--r--drivers/spi/spi-imx.c7
1 files changed, 0 insertions, 7 deletions
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;