summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-sirf.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-01-17 18:53:40 +0800
committerMark Brown <broonie@linaro.org>2014-01-17 15:54:22 +0000
commit23061f1eb844edd349c3a0f5f40e244c9d2abfde (patch)
treee7b8cc5fe643faac2472ddcf0fc14c3ef325be78 /drivers/spi/spi-sirf.c
parent81e53d0470878165a300d75ac06a5bc5eee543a2 (diff)
downloadop-kernel-dev-23061f1eb844edd349c3a0f5f40e244c9d2abfde.zip
op-kernel-dev-23061f1eb844edd349c3a0f5f40e244c9d2abfde.tar.gz
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-sirf.c')
-rw-r--r--drivers/spi/spi-sirf.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index ed5e501..e430689 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -536,16 +536,9 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
static int spi_sirfsoc_setup(struct spi_device *spi)
{
- struct sirfsoc_spi *sspi;
-
if (!spi->max_speed_hz)
return -EINVAL;
- sspi = spi_master_get_devdata(spi->master);
-
- if (!spi->bits_per_word)
- spi->bits_per_word = 8;
-
return spi_sirfsoc_setup_transfer(spi, NULL);
}
OpenPOWER on IntegriCloud