aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi_txx9.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/spi_txx9.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/spi_txx9.c')
-rw-r--r--drivers/spi/spi_txx9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index 29cbb065618a..8e36b2153d9a 100644
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -126,7 +126,7 @@ static int txx9spi_setup(struct spi_device *spi)
126 || spi->max_speed_hz < c->min_speed_hz) 126 || spi->max_speed_hz < c->min_speed_hz)
127 return -EINVAL; 127 return -EINVAL;
128 128
129 bits_per_word = spi->bits_per_word ? : 8; 129 bits_per_word = spi->bits_per_word;
130 if (bits_per_word != 8 && bits_per_word != 16) 130 if (bits_per_word != 8 && bits_per_word != 16)
131 return -EINVAL; 131 return -EINVAL;
132 132