diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-06-17 16:26:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 13:03:42 -0700 |
| commit | 7d0771970c51e736758525dd71fb82dd036b823a (patch) | |
| tree | 9ff72b89cd06cd67e0db681859606dd77f5cba80 /drivers/spi/spi_imx.c | |
| parent | b4bd2ababd20b6ecdd49cf96e39c875fbedd53af (diff) | |
| download | kernel_samsung_smdk4412-7d0771970c51e736758525dd71fb82dd036b823a.zip kernel_samsung_smdk4412-7d0771970c51e736758525dd71fb82dd036b823a.tar.gz kernel_samsung_smdk4412-7d0771970c51e736758525dd71fb82dd036b823a.tar.bz2 | |
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_imx.c')
| -rw-r--r-- | drivers/spi/spi_imx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 0671aee..26d5ef0 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c @@ -1286,10 +1286,7 @@ static int setup(struct spi_device *spi) /* SPI word width */ tmp = spi->bits_per_word; - if (tmp == 0) { - tmp = 8; - spi->bits_per_word = 8; - } else if (tmp > 16) { + if (tmp > 16) { status = -EINVAL; dev_err(&spi->dev, "setup - " |