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/xilinx_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/xilinx_spi.c')
-rw-r--r-- | drivers/spi/xilinx_spi.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 494d3f756e29..2d7e6b81fb4a 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c | |||
@@ -170,9 +170,6 @@ static int xilinx_spi_setup(struct spi_device *spi) | |||
170 | xspi = spi_master_get_devdata(spi->master); | 170 | xspi = spi_master_get_devdata(spi->master); |
171 | bitbang = &xspi->bitbang; | 171 | bitbang = &xspi->bitbang; |
172 | 172 | ||
173 | if (!spi->bits_per_word) | ||
174 | spi->bits_per_word = 8; | ||
175 | |||
176 | if (spi->mode & ~MODEBITS) { | 173 | if (spi->mode & ~MODEBITS) { |
177 | dev_err(&spi->dev, "%s, unsupported mode bits %x\n", | 174 | dev_err(&spi->dev, "%s, unsupported mode bits %x\n", |
178 | __func__, spi->mode & ~MODEBITS); | 175 | __func__, spi->mode & ~MODEBITS); |
@@ -183,9 +180,6 @@ static int xilinx_spi_setup(struct spi_device *spi) | |||
183 | if (retval < 0) | 180 | if (retval < 0) |
184 | return retval; | 181 | return retval; |
185 | 182 | ||
186 | dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n", | ||
187 | __func__, spi->mode & MODEBITS, spi->bits_per_word, 0); | ||
188 | |||
189 | return 0; | 183 | return 0; |
190 | } | 184 | } |
191 | 185 | ||