Unverified Commit 09134c53 authored by Yoshitaka Ikeda's avatar Yoshitaka Ikeda Committed by Mark Brown
Browse files

spi: Fixed division by zero warning 



The reason for dividing by zero is because the dummy bus width is zero,
but if the dummy n bytes is zero, it indicates that there is no data transfer,
so there is no need for calculation.

Fixes: 7512eaf5 ("spi: cadence-quadspi: Fix dummy cycle calculation when buswidth > 1")
Signed-off-by: default avatarYoshitaka Ikeda <ikeda@nskint.co.jp>
Acked-by: default avatarPratyush Yadav <p.yadav@ti.com>
Link: https://lore.kernel.org/r/OSZPR01MB70049C8F56ED8902852DF97B8BD49@OSZPR01MB7004.jpnprd01.prod.outlook.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3323129a

drivers/spi/atmel-quadspi.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq, 
		return mode;

	ifr |= atmel_qspi_modes[mode].config;



	if (op->dummy.buswidth && op->dummy.nbytes)

	if (op->dummy.nbytes)

		dummy_cycles = op->dummy.nbytes * 8 / op->dummy.buswidth;



	/*

drivers/spi/spi-bcm-qspi.c

+2 −1
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ static int bcm_qspi_bspi_set_flex_mode(struct bcm_qspi *qspi, 
	if (addrlen == BSPI_ADDRLEN_4BYTES)

		bpp = BSPI_BPP_ADDR_SELECT_MASK;



	if (op->dummy.nbytes)

		bpp |= (op->dummy.nbytes * 8) / op->dummy.buswidth;



	switch (width) {

drivers/spi/spi-mtk-nor.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static bool mtk_nor_match_read(const struct spi_mem_op *op) 
{

	int dummy = 0;



	if (op->dummy.buswidth)

	if (op->dummy.nbytes)

		dummy = op->dummy.nbytes * BITS_PER_BYTE / op->dummy.buswidth;



	if ((op->data.buswidth == 2) || (op->data.buswidth == 4)) {

drivers/spi/spi-stm32-qspi.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) 
		ccr |= FIELD_PREP(CCR_ADSIZE_MASK, op->addr.nbytes - 1);

	}



	if (op->dummy.buswidth && op->dummy.nbytes)

	if (op->dummy.nbytes)

		ccr |= FIELD_PREP(CCR_DCYC_MASK,

				  op->dummy.nbytes * 8 / op->dummy.buswidth);