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-sh.c | |
| parent | Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw (diff) | |
| download | linux-dev-23061f1eb844edd349c3a0f5f40e244c9d2abfde.tar.xz linux-dev-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-sh.c')
| -rw-r--r-- | drivers/spi/spi-sh.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c index c120a70094f2..86a17d60a68c 100644 --- a/drivers/spi/spi-sh.c +++ b/drivers/spi/spi-sh.c @@ -358,9 +358,6 @@ static int spi_sh_setup(struct spi_device *spi) { struct spi_sh_data *ss = spi_master_get_devdata(spi->master); - if (!spi->bits_per_word) - spi->bits_per_word = 8; - pr_debug("%s: enter\n", __func__); spi_sh_write(ss, 0xfe, SPI_SH_CR1); /* SPI sycle stop */ |