spi: spi-cadence-quadspi: Revert "Fix division by zero warning"

Revert to change to a better code.

This reverts commit 55cef88bbf12f3bfbe5c2379a8868a034707e755.

Signed-off-by: Yoshitaka Ikeda <ikeda@nskint.co.jp>
Link: https://lore.kernel.org/r/bd30bdb4-07c4-f713-5648-01c898d51f1b@nskint.co.jp
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 13d1f0ce618eb8a50f86677d8bb54d482112c12e..7a00346ff9b92b61ac18c9e2021bea580ba8cbad 100644 (file)
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -307,13 +307,11 @@ static unsigned int cqspi_calc_rdreg(struct cqspi_flash_pdata *f_pdata)
 
 static unsigned int cqspi_calc_dummy(const struct spi_mem_op *op, bool dtr)
 {
-       unsigned int dummy_clk = 0;
+       unsigned int dummy_clk;
 
-       if (op->dummy.buswidth && op->dummy.nbytes) {
-               dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
-               if (dtr)
-                       dummy_clk /= 2;
-       }
+       dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
+       if (dtr)
+               dummy_clk /= 2;
 
        return dummy_clk;
 }