spi: remove check for bits_per_word on transfer from low level driver

[deliverable/linux.git] / drivers / spi / spi-bfin5xx.c

diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index 0429d833f75bf0125df06e5c51d44819769b405c..7d7c9918fffeed817a8f55ee99e37e7eee4016df 100644 (file)
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -642,8 +642,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
        drv_data->cs_change = transfer->cs_change;
 
        /* Bits per word setup */
-       bits_per_word = transfer->bits_per_word ? :
-               message->spi->bits_per_word ? : 8;
+       bits_per_word = transfer->bits_per_word;
        if (bits_per_word % 16 == 0) {
                drv_data->n_bytes = bits_per_word/8;
                drv_data->len = (transfer->len) >> 1;