Browse Source

spi: coldfire-qspi: Simplify the code to set register bits for transfer speed

spi core will use spi->max_speed_hz as transfer speed if the transfer speed was
not set. So we don't need to test t->speed_hz in mcfqspi_transfer_one().

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Axel Lin 11 years ago
parent
commit
8023d384ff
1 changed files with 1 additions and 4 deletions
  1. 1 4
      drivers/spi/spi-coldfire-qspi.c

+ 1 - 4
drivers/spi/spi-coldfire-qspi.c

@@ -321,10 +321,7 @@ static int mcfqspi_transfer_one(struct spi_master *master,
 		qmr |= MCFQSPI_QMR_CPHA;
 		qmr |= MCFQSPI_QMR_CPHA;
 	if (spi->mode & SPI_CPOL)
 	if (spi->mode & SPI_CPOL)
 		qmr |= MCFQSPI_QMR_CPOL;
 		qmr |= MCFQSPI_QMR_CPOL;
-	if (t->speed_hz)
-		qmr |= mcfqspi_qmr_baud(t->speed_hz);
-	else
-		qmr |= mcfqspi_qmr_baud(spi->max_speed_hz);
+	qmr |= mcfqspi_qmr_baud(t->speed_hz);
 	mcfqspi_wr_qmr(mcfqspi, qmr);
 	mcfqspi_wr_qmr(mcfqspi, qmr);
 
 
 	mcfqspi_wr_qir(mcfqspi, MCFQSPI_QIR_SPIFE);
 	mcfqspi_wr_qir(mcfqspi, MCFQSPI_QIR_SPIFE);