aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-10-01 18:44:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-01 19:11:16 -0400
commit4388eb11351660c7688a4756aa6da99bfb4bc129 (patch)
treebbf682727389c4aa3f21c760bf10c1ca4813c16f /drivers/spi
parent3910f2cff90f447e37d32f8f7d60566042b8bdbe (diff)
spi-imx: no need to assert bits_per_word being initialized
spi_imx_setup() is only called by spi_setup(). The latter does the initialization already. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: David Brownell <dbrownell@users.sourceforge.net> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_imx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 84dd4f3bd50e..b6a8149220fb 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -481,9 +481,6 @@ static int spi_imx_setup(struct spi_device *spi)
481 struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); 481 struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
482 int gpio = spi_imx->chipselect[spi->chip_select]; 482 int gpio = spi_imx->chipselect[spi->chip_select];
483 483
484 if (!spi->bits_per_word)
485 spi->bits_per_word = 8;
486
487 pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__, 484 pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__,
488 spi->mode, spi->bits_per_word, spi->max_speed_hz); 485 spi->mode, spi->bits_per_word, spi->max_speed_hz);
489 486