Skip to content

Commit eaeac04

Browse files
Wolfram Sangbroonie
authored andcommitted
spi: imx: 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: Wolfram Sang <[email protected]> Reviewed-by: Peng Fan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent eef51e9 commit eaeac04

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/spi/spi-imx.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
14051405
{
14061406
struct dma_async_tx_descriptor *desc_tx, *desc_rx;
14071407
unsigned long transfer_timeout;
1408-
unsigned long timeout;
1408+
unsigned long time_left;
14091409
struct spi_controller *controller = spi_imx->controller;
14101410
struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg;
14111411
struct scatterlist *last_sg = sg_last(rx->sgl, rx->nents);
@@ -1471,18 +1471,18 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
14711471
transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len);
14721472

14731473
/* Wait SDMA to finish the data transfer.*/
1474-
timeout = wait_for_completion_timeout(&spi_imx->dma_tx_completion,
1474+
time_left = wait_for_completion_timeout(&spi_imx->dma_tx_completion,
14751475
transfer_timeout);
1476-
if (!timeout) {
1476+
if (!time_left) {
14771477
dev_err(spi_imx->dev, "I/O Error in DMA TX\n");
14781478
dmaengine_terminate_all(controller->dma_tx);
14791479
dmaengine_terminate_all(controller->dma_rx);
14801480
return -ETIMEDOUT;
14811481
}
14821482

1483-
timeout = wait_for_completion_timeout(&spi_imx->dma_rx_completion,
1484-
transfer_timeout);
1485-
if (!timeout) {
1483+
time_left = wait_for_completion_timeout(&spi_imx->dma_rx_completion,
1484+
transfer_timeout);
1485+
if (!time_left) {
14861486
dev_err(&controller->dev, "I/O Error in DMA RX\n");
14871487
spi_imx->devtype_data->reset(spi_imx);
14881488
dmaengine_terminate_all(controller->dma_rx);
@@ -1501,7 +1501,7 @@ static int spi_imx_pio_transfer(struct spi_device *spi,
15011501
{
15021502
struct spi_imx_data *spi_imx = spi_controller_get_devdata(spi->controller);
15031503
unsigned long transfer_timeout;
1504-
unsigned long timeout;
1504+
unsigned long time_left;
15051505

15061506
spi_imx->tx_buf = transfer->tx_buf;
15071507
spi_imx->rx_buf = transfer->rx_buf;
@@ -1517,9 +1517,9 @@ static int spi_imx_pio_transfer(struct spi_device *spi,
15171517

15181518
transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len);
15191519

1520-
timeout = wait_for_completion_timeout(&spi_imx->xfer_done,
1521-
transfer_timeout);
1522-
if (!timeout) {
1520+
time_left = wait_for_completion_timeout(&spi_imx->xfer_done,
1521+
transfer_timeout);
1522+
if (!time_left) {
15231523
dev_err(&spi->dev, "I/O Error in PIO\n");
15241524
spi_imx->devtype_data->reset(spi_imx);
15251525
return -ETIMEDOUT;

0 commit comments

Comments
 (0)