diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-12-18 14:25:43 +0530 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 12:26:59 +0000 |
commit | 766ed70447e0a9cfb23d068a4a929e18e54b0022 (patch) | |
tree | 95e426348573fd136fa4c7aeeeffb84143661e7a /drivers/spi/spi-s3c64xx.c | |
parent | bb29785e0d6d150181704be2efcc3141044625e2 (diff) | |
download | op-kernel-dev-766ed70447e0a9cfb23d068a4a929e18e54b0022.zip op-kernel-dev-766ed70447e0a9cfb23d068a4a929e18e54b0022.tar.gz |
spi: remove check for bits_per_word on transfer from low level driver
The spi core make sure that each transfer structure have the proper
setting for bits_per_word before calling low level transfer APIs.
Hence it is no more require to check again in low level driver for
this field whether this is set correct or not. Removing such code
from low level driver.
The txx9 change also removes a test for bits_per_word set to 0, and
forcing it to 8 in that case. This can also be removed now since
spi_setup() ensures spi->bits_per_word is not zero.
if (!spi->bits_per_word)
spi->bits_per_word = 8;
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi-s3c64xx.c')
-rw-r--r-- | drivers/spi/spi-s3c64xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index ad93231..d77b656 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -697,7 +697,7 @@ static int s3c64xx_spi_transfer_one_message(struct spi_master *master, INIT_COMPLETION(sdd->xfer_completion); /* Only BPW and Speed may change across transfers */ - bpw = xfer->bits_per_word ? : spi->bits_per_word; + bpw = xfer->bits_per_word; speed = xfer->speed_hz ? : spi->max_speed_hz; if (xfer->len % (bpw / 8)) { |