Unverified Commit bd961699 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

spi: imx: Simplify logic in spi_imx_push() 



For each usage of fifo_words it is clear if ->dynamic_burst is true or
not. This can be used to simplify the function a bit.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20210716173927.2050620-1-u.kleine-koenig@pengutronix.de


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

drivers/spi/spi-imx.c

+3 −8
Original line number Diff line number Diff line
@@ -1038,12 +1038,8 @@ static void spi_imx_set_burst_len(struct spi_imx_data *spi_imx, int n_bits) 


static void spi_imx_push(struct spi_imx_data *spi_imx)

{

	unsigned int burst_len, fifo_words;

	unsigned int burst_len;



	if (spi_imx->dynamic_burst)

		fifo_words = 4;

	else

		fifo_words = spi_imx_bytes_per_word(spi_imx->bits_per_word);

	/*

	 * Reload the FIFO when the remaining bytes to be transferred in the

	 * current burst is 0. This only applies when bits_per_word is a
@@ -1062,7 +1058,7 @@ static void spi_imx_push(struct spi_imx_data *spi_imx) 


			spi_imx->remainder = burst_len;

		} else {

			spi_imx->remainder = fifo_words;

			spi_imx->remainder = spi_imx_bytes_per_word(spi_imx->bits_per_word);

		}

	}
@@ -1070,8 +1066,7 @@ static void spi_imx_push(struct spi_imx_data *spi_imx) 
		if (!spi_imx->count)

			break;

		if (spi_imx->dynamic_burst &&

		    spi_imx->txfifo >= DIV_ROUND_UP(spi_imx->remainder,

						     fifo_words))

		    spi_imx->txfifo >= DIV_ROUND_UP(spi_imx->remainder, 4))

			break;

		spi_imx->tx(spi_imx);

		spi_imx->txfifo++;