spi: fsl-lpspi: use 'time_left' variable with wait_for_completion_timeout()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Tue, 30 Apr 2024 11:41:34 +0000 (13:41 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 30 Apr 2024 14:57:27 +0000 (23:57 +0900)
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: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430114142.28551-3-wsa+renesas@sang-engineering.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-fsl-lpspi.c

index 92a662d1b55cf2ed044fcbbfe96fd03ef0035736..aa5ed254be46c85dc590cefd65744cace439a348 100644 (file)
@@ -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,
-                                                     transfer_timeout);
-               if (!timeout) {
+               time_left = wait_for_completion_timeout(&fsl_lpspi->dma_tx_completion,
+                                                       transfer_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,
-                                                     transfer_timeout);
-               if (!timeout) {
+               time_left = wait_for_completion_timeout(&fsl_lpspi->dma_rx_completion,
+                                                       transfer_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);