diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2009-06-17 19:26:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 16:03:42 -0400 |
commit | 7d0771970c51e736758525dd71fb82dd036b823a (patch) | |
tree | 9ff72b89cd06cd67e0db681859606dd77f5cba80 /drivers/spi/au1550_spi.c | |
parent | b4bd2ababd20b6ecdd49cf96e39c875fbedd53af (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/au1550_spi.c')
-rw-r--r-- | drivers/spi/au1550_spi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c index b02f25c702fd..6a407e60f05b 100644 --- a/drivers/spi/au1550_spi.c +++ b/drivers/spi/au1550_spi.c | |||
@@ -291,8 +291,6 @@ static int au1550_spi_setup(struct spi_device *spi) | |||
291 | { | 291 | { |
292 | struct au1550_spi *hw = spi_master_get_devdata(spi->master); | 292 | struct au1550_spi *hw = spi_master_get_devdata(spi->master); |
293 | 293 | ||
294 | if (spi->bits_per_word == 0) | ||
295 | spi->bits_per_word = 8; | ||
296 | if (spi->bits_per_word < 4 || spi->bits_per_word > 24) { | 294 | if (spi->bits_per_word < 4 || spi->bits_per_word > 24) { |
297 | dev_err(&spi->dev, "setup: invalid bits_per_word=%d\n", | 295 | dev_err(&spi->dev, "setup: invalid bits_per_word=%d\n", |
298 | spi->bits_per_word); | 296 | spi->bits_per_word); |