projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic...
[linux-2.6-block.git]
/
drivers
/
spi
/
spi-davinci.c
diff --git
a/drivers/spi/spi-davinci.c
b/drivers/spi/spi-davinci.c
index 79d40c8b1cd0719a22c3479d9002da4d80cbe3ea..5e7389faa2a0189472d71fedcba95ae8ecd1cf35 100644
(file)
--- a/
drivers/spi/spi-davinci.c
+++ b/
drivers/spi/spi-davinci.c
@@
-396,10
+396,6
@@
static int davinci_spi_setup(struct spi_device *spi)
dspi = spi_master_get_devdata(spi->master);
pdata = &dspi->pdata;
dspi = spi_master_get_devdata(spi->master);
pdata = &dspi->pdata;
- /* if bits per word length is zero then set it default 8 */
- if (!spi->bits_per_word)
- spi->bits_per_word = 8;
-
if (!(spi->mode & SPI_NO_CS)) {
if ((pdata->chip_sel == NULL) ||
(pdata->chip_sel[spi->chip_select] == SPI_INTERN_CS))
if (!(spi->mode & SPI_NO_CS)) {
if ((pdata->chip_sel == NULL) ||
(pdata->chip_sel[spi->chip_select] == SPI_INTERN_CS))