diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-01-17 18:53:40 +0800 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-17 15:54:22 +0000 |
commit | 23061f1eb844edd349c3a0f5f40e244c9d2abfde (patch) | |
tree | e7b8cc5fe643faac2472ddcf0fc14c3ef325be78 /drivers/spi/spi-mxs.c | |
parent | 81e53d0470878165a300d75ac06a5bc5eee543a2 (diff) | |
download | linux-23061f1eb844edd349c3a0f5f40e244c9d2abfde.tar.gz linux-23061f1eb844edd349c3a0f5f40e244c9d2abfde.tar.bz2 linux-23061f1eb844edd349c3a0f5f40e244c9d2abfde.zip |
spi: Remove duplicate code to set default bits_per_word setting
The implementation in spi_setup() already set spi->bits_per_word = 8 when
spi->bits_per_word is 0 before calling spi->master->setup.
So we don't need to do it again in setup() callback.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-mxs.c')
-rw-r--r-- | drivers/spi/spi-mxs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 3adebfa22e3d..79e5aa2250c8 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -111,14 +111,6 @@ static int mxs_spi_setup_transfer(struct spi_device *dev, return 0; } -static int mxs_spi_setup(struct spi_device *dev) -{ - if (!dev->bits_per_word) - dev->bits_per_word = 8; - - return 0; -} - static u32 mxs_spi_cs_to_reg(unsigned cs) { u32 select = 0; @@ -502,7 +494,6 @@ static int mxs_spi_probe(struct platform_device *pdev) return -ENOMEM; master->transfer_one_message = mxs_spi_transfer_one; - master->setup = mxs_spi_setup; master->bits_per_word_mask = SPI_BPW_MASK(8); master->mode_bits = SPI_CPOL | SPI_CPHA; master->num_chipselect = 3; |