Unverified Commit eef51e99 authored by Wolfram Sang's avatar Wolfram Sang Committed by Mark Brown
Browse files

spi: fsl-lpspi: use 'time_left' variable with wait_for_completion_timeout() 



There is a confusing pattern in the kernel to use a variable named 'timeout' to
store the result of wait_for_completion_timeout() causing patterns like:

	timeout = wait_for_completion_timeout(...)
	if (!timeout) return -ETIMEDOUT;

with all kinds of permutations. Use 'time_left' as a variable to make the code
self explaining.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430114142.28551-3-wsa+renesas@sang-engineering.com


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

drivers/spi/spi-fsl-lpspi.c

+7 −7
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller, 
{

	struct dma_async_tx_descriptor *desc_tx, *desc_rx;

	unsigned long transfer_timeout;

	unsigned long timeout;

	unsigned long time_left;

	struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg;

	int ret;
@@ -594,9 +594,9 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller, 
							       transfer->len);



		/* Wait eDMA to finish the data transfer.*/

		timeout = wait_for_completion_timeout(&fsl_lpspi->dma_tx_completion,

		time_left = wait_for_completion_timeout(&fsl_lpspi->dma_tx_completion,

							transfer_timeout);

		if (!timeout) {

		if (!time_left) {

			dev_err(fsl_lpspi->dev, "I/O Error in DMA TX\n");

			dmaengine_terminate_all(controller->dma_tx);

			dmaengine_terminate_all(controller->dma_rx);
@@ -604,9 +604,9 @@ static int fsl_lpspi_dma_transfer(struct spi_controller *controller, 
			return -ETIMEDOUT;

		}



		timeout = wait_for_completion_timeout(&fsl_lpspi->dma_rx_completion,

		time_left = wait_for_completion_timeout(&fsl_lpspi->dma_rx_completion,

							transfer_timeout);

		if (!timeout) {

		if (!time_left) {

			dev_err(fsl_lpspi->dev, "I/O Error in DMA RX\n");

			dmaengine_terminate_all(controller->dma_tx);

			dmaengine_terminate_all(controller->dma_rx);