aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-09-04 03:56:57 -0400
committerMark Brown <broonie@kernel.org>2016-09-06 06:55:20 -0400
commita755af52f8ef278985d1475070c0647f2e6e47a7 (patch)
treea589d76588814c1f556565c9e362318bb1c780be
parentdaae020ce9fe4324322c6ed18a840234a05d76b3 (diff)
spi: fsl-espi: simplify fsl_espi_setup_transfer
Simplify fsl_espi_setup_transfer a little. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-fsl-espi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index a9004fe5a5ed..b00313bed7e9 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -166,12 +166,10 @@ static void fsl_espi_setup_transfer(struct spi_device *spi,
166 mpc8xxx_spi->get_rx = cs->get_rx; 166 mpc8xxx_spi->get_rx = cs->get_rx;
167 mpc8xxx_spi->get_tx = cs->get_tx; 167 mpc8xxx_spi->get_tx = cs->get_tx;
168 168
169 bits_per_word = bits_per_word - 1;
170
171 /* mask out bits we are going to set */ 169 /* mask out bits we are going to set */
172 cs->hw_mode &= ~(CSMODE_LEN(0xF) | CSMODE_DIV16 | CSMODE_PM(0xF)); 170 cs->hw_mode &= ~(CSMODE_LEN(0xF) | CSMODE_DIV16 | CSMODE_PM(0xF));
173 171
174 cs->hw_mode |= CSMODE_LEN(bits_per_word); 172 cs->hw_mode |= CSMODE_LEN(bits_per_word - 1);
175 173
176 if ((mpc8xxx_spi->spibrg / hz) > 64) { 174 if ((mpc8xxx_spi->spibrg / hz) > 64) {
177 cs->hw_mode |= CSMODE_DIV16; 175 cs->hw_mode |= CSMODE_DIV16;