diff options
| author | Axel Lin | 2014-01-17 11:53:40 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-01-17 16:54:22 +0100 |
| commit | 23061f1eb844edd349c3a0f5f40e244c9d2abfde (patch) | |
| tree | e7b8cc5fe643faac2472ddcf0fc14c3ef325be78 /drivers/spi/spi-davinci.c | |
| parent | Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub... (diff) | |
| download | kernel-qcow2-linux-23061f1eb844edd349c3a0f5f40e244c9d2abfde.tar.gz kernel-qcow2-linux-23061f1eb844edd349c3a0f5f40e244c9d2abfde.tar.xz kernel-qcow2-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-davinci.c')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 50b2d88c8190..ff22fb6a2a03 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -396,10 +396,6 @@ static int davinci_spi_setup(struct spi_device *spi) dspi = spi_master_get_devdata(spi->master); pdata = &dspi->pdata; - /* if bits per word length is zero then set it default 8 */ - if (!spi->bits_per_word) - spi->bits_per_word = 8; - if (!(spi->mode & SPI_NO_CS)) { if ((pdata->chip_sel == NULL) || (pdata->chip_sel[spi->chip_select] == SPI_INTERN_CS)) |