aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-mxs.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index d7b3e4311f72..de7b1141b90f 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -67,13 +67,8 @@ static int mxs_spi_setup_transfer(struct spi_device *dev,
67{ 67{
68 struct mxs_spi *spi = spi_master_get_devdata(dev->master); 68 struct mxs_spi *spi = spi_master_get_devdata(dev->master);
69 struct mxs_ssp *ssp = &spi->ssp; 69 struct mxs_ssp *ssp = &spi->ssp;
70 uint8_t bits_per_word;
71 uint32_t hz = 0; 70 uint32_t hz = 0;
72 71
73 bits_per_word = dev->bits_per_word;
74 if (t && t->bits_per_word)
75 bits_per_word = t->bits_per_word;
76
77 hz = dev->max_speed_hz; 72 hz = dev->max_speed_hz;
78 if (t && t->speed_hz) 73 if (t && t->speed_hz)
79 hz = min(hz, t->speed_hz); 74 hz = min(hz, t->speed_hz);