summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorEsben Haabendal <eha@deif.com>2018-06-20 09:34:31 +0200
committerMark Brown <broonie@kernel.org>2018-06-20 15:45:36 +0200
commitc87bdcc89d867df13fbb92d05323337bfd15d579 (patch)
treef0aba298b3d6aa8cc8e35fb656b8065d2478a9dd /drivers/spi
parentspi: remove unused adi_spi3.h header (diff)
downloadlinux-c87bdcc89d867df13fbb92d05323337bfd15d579.tar.xz
linux-c87bdcc89d867df13fbb92d05323337bfd15d579.zip
spi: spi-fsl-dspi: Drop unreachable else if statement
The if statement just above this if/else statement triggers on the same condition, and then invalidates it. Signed-off-by: Esben Haabendal <eha@deif.com> Acked-by: Martin Hundebøll <martin@geanix.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-dspi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 0630962ce442..3ca9b9608801 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -593,8 +593,7 @@ static int dspi_eoq_write(struct fsl_dspi *dspi)
dspi_pushr |= SPI_PUSHR_EOQ;
if ((dspi->cs_change) && (!dspi->len))
dspi_pushr &= ~SPI_PUSHR_CONT;
- } else if (tx_word && (dspi->len == 1))
- dspi_pushr |= SPI_PUSHR_EOQ;
+ }
regmap_write(dspi->regmap, SPI_PUSHR, dspi_pushr);