aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-rspi.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-01-17 05:53:40 -0500
committerMark Brown <broonie@linaro.org>2014-01-17 10:54:22 -0500
commit23061f1eb844edd349c3a0f5f40e244c9d2abfde (patch)
treee7b8cc5fe643faac2472ddcf0fc14c3ef325be78 /drivers/spi/spi-rspi.c
parent81e53d0470878165a300d75ac06a5bc5eee543a2 (diff)
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-rspi.c')
-rw-r--r--drivers/spi/spi-rspi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 7838b7e71910..d1e89bb352d8 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -802,8 +802,6 @@ static int rspi_setup(struct spi_device *spi)
802{ 802{
803 struct rspi_data *rspi = spi_master_get_devdata(spi->master); 803 struct rspi_data *rspi = spi_master_get_devdata(spi->master);
804 804
805 if (!spi->bits_per_word)
806 spi->bits_per_word = 8;
807 rspi->max_speed_hz = spi->max_speed_hz; 805 rspi->max_speed_hz = spi->max_speed_hz;
808 806
809 rspi->spcmd = SPCMD_SSLKP; 807 rspi->spcmd = SPCMD_SSLKP;