spi: spi-fsl-spi: remove always-true conditional in fsl_spi_do_one_msg

commit 24c363623361b430fb79459ca922e816e6f48603 upstream.

__spi_validate() in the generic SPI code sets ->speed_hz and
->bits_per_word to non-zero values, so this condition is always true.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 5e49fed487f8a1e150a19d1de7f4d009d17fd71d..c99fb47d02aed1632b3e8fd909341dc29fac70d6 100644 (file)
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -387,12 +387,10 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
        cs_change = 1;
        status = -EINVAL;
        list_for_each_entry(t, &m->transfers, transfer_list) {
-               if (t->bits_per_word || t->speed_hz) {
-                       if (cs_change)
-                               status = fsl_spi_setup_transfer(spi, t);
-                       if (status < 0)
-                               break;
-               }
+               if (cs_change)
+                       status = fsl_spi_setup_transfer(spi, t);
+               if (status < 0)
+                       break;
 
                if (cs_change) {
                        fsl_spi_chipselect(spi, BITBANG_CS_ACTIVE);