mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

spi: atmel: Remove needless bits_per_word and speed_hz tests

Browse source 
SPI core validates both bits_per_word and speed_hz transfer parameters and
defaults to spi->bits_per_word and spi->max_speed_hz in case these per
transfer parameters are not set. This makes possible to remove two if
statements and remove one code block that is never executed.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jarkko Nikula 2015-09-25 09:03:01 +03:00 committed by Mark Brown
parent 6ff33f3902
commit e8646580cc
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/spi/spi-atmel.c
View file

@ -871,14 +871,7 @@ static int atmel_spi_set_xfer_speed(struct atmel_spi *as,
* Calculate the lowest divider that satisfies the * Calculate the lowest divider that satisfies the
* constraint, assuming div32/fdiv/mbz == 0. * constraint, assuming div32/fdiv/mbz == 0.
*/ */
if (xfer->speed_hz)
scbr = DIV_ROUND_UP(bus_hz, xfer->speed_hz); scbr = DIV_ROUND_UP(bus_hz, xfer->speed_hz);
else
/*
* This can happend if max_speed is null.
* In this case, we set the lowest possible speed
*/
scbr = 0xff;
/* /*
* If the resulting divider doesn't fit into the * If the resulting divider doesn't fit into the
@ -1300,7 +1293,6 @@ static int atmel_spi_one_transfer(struct spi_master *master,
return -EINVAL; return -EINVAL;
} }
if (xfer->bits_per_word) {
asd = spi->controller_state; asd = spi->controller_state;
bits = (asd->csr >> 4) & 0xf; bits = (asd->csr >> 4) & 0xf;
if (bits != xfer->bits_per_word - 8) { if (bits != xfer->bits_per_word - 8) {
@ -1308,7 +1300,6 @@ static int atmel_spi_one_transfer(struct spi_master *master,
"you can't yet change bits_per_word in transfers\n"); "you can't yet change bits_per_word in transfers\n");
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
}
/* /*
* DMA map early, for performance (empties dcache ASAP) and * DMA map early, for performance (empties dcache ASAP) and