aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/orion_spi.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-06-17 19:26:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 16:03:42 -0400
commit7d0771970c51e736758525dd71fb82dd036b823a (patch)
tree9ff72b89cd06cd67e0db681859606dd77f5cba80 /drivers/spi/orion_spi.c
parentb4bd2ababd20b6ecdd49cf96e39c875fbedd53af (diff)
spi: move common spi_setup() functionality into core
Start moving some spi_setup() functionality into the SPI core from the various spi_master controller drivers: - Make that function stop being an inline; - Move two common idioms from drivers into that new function: * Default bits_per_word to 8 if that field isn't set * Issue a standardized dev_dbg() message This is a net minor source code shrink, and supports enhancments found in some follow-up patches. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/orion_spi.c')
-rw-r--r--drivers/spi/orion_spi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c
index c8b0babdc2a6..6d5e33bb4b4a 100644
--- a/drivers/spi/orion_spi.c
+++ b/drivers/spi/orion_spi.c
@@ -369,9 +369,6 @@ static int orion_spi_setup(struct spi_device *spi)
369 orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG, 369 orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
370 (1 << 14)); 370 (1 << 14));
371 371
372 if (spi->bits_per_word == 0)
373 spi->bits_per_word = 8;
374
375 if ((spi->max_speed_hz == 0) 372 if ((spi->max_speed_hz == 0)
376 || (spi->max_speed_hz > orion_spi->max_speed)) 373 || (spi->max_speed_hz > orion_spi->max_speed))
377 spi->max_speed_hz = orion_spi->max_speed; 374 spi->max_speed_hz = orion_spi->max_speed;