2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00

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>
This commit is contained in:
Sascha Hauer 2017-06-02 07:38:00 +02:00 committed by Mark Brown
parent abb1ff195a
commit 494f3193bd

View File

@ -218,8 +218,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
return false; return false;
bpw = transfer->bits_per_word; bpw = transfer->bits_per_word;
if (!bpw)
bpw = spi->bits_per_word;
bpw = spi_imx_bytes_per_word(bpw); 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.bpw = t->bits_per_word;
config.speed_hz = t->speed_hz; 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 */ /* Initialize the functions for transfer */
if (config.bpw <= 8) { if (config.bpw <= 8) {
spi_imx->rx = spi_imx_buf_rx_u8; spi_imx->rx = spi_imx_buf_rx_u8;