spi: spi-bfin5xx: Calculate transfer speed unconditionally

[mirror_ubuntu-artful-kernel.git] / drivers / spi / spi-bfin5xx.c

diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index a3d65b4f49445d144fcba077ce3413630300e8c8..1e91325bf39c20f0b5fdc368680de06d566fdb6f 100644 (file)
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -661,11 +661,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
        message->state = RUNNING_STATE;
        dma_config = 0;
 
-       /* Speed setup (surely valid because already checked) */
-       if (transfer->speed_hz)
-               bfin_write(&drv_data->regs->baud, hz_to_spi_baud(transfer->speed_hz));
-       else
-               bfin_write(&drv_data->regs->baud, chip->baud);
+       bfin_write(&drv_data->regs->baud, hz_to_spi_baud(transfer->speed_hz));
 
        bfin_write(&drv_data->regs->stat, BIT_STAT_CLR);
        bfin_spi_cs_active(drv_data, chip);