]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
fpga: zynq-fpga: Rename 'timeout' variable as 'time_left'
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 29 Jul 2024 10:42:23 +0000 (12:42 +0200)
committerXu Yilun <yilun.xu@linux.intel.com>
Wed, 14 Aug 2024 15:58:14 +0000 (23:58 +0800)
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>
Acked-by: Michal Simek <michal.simek@amd.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20240729104319.2658-2-wsa+renesas@sang-engineering.com
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>
drivers/fpga/zynq-fpga.c

index 0ac93183d201650d8e8a0f9b106bbb6e40183a76..4db3d80e10b090b85944cd4747e4ca2c45c52a56 100644 (file)
@@ -387,7 +387,7 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr, struct sg_table *sgt)
        const char *why;
        int err;
        u32 intr_status;
-       unsigned long timeout;
+       unsigned long time_left;
        unsigned long flags;
        struct scatterlist *sg;
        int i;
@@ -427,8 +427,8 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr, struct sg_table *sgt)
        zynq_step_dma(priv);
        spin_unlock_irqrestore(&priv->dma_lock, flags);
 
-       timeout = wait_for_completion_timeout(&priv->dma_done,
-                                             msecs_to_jiffies(DMA_TIMEOUT_MS));
+       time_left = wait_for_completion_timeout(&priv->dma_done,
+                                               msecs_to_jiffies(DMA_TIMEOUT_MS));
 
        spin_lock_irqsave(&priv->dma_lock, flags);
        zynq_fpga_set_irq(priv, 0);
@@ -452,7 +452,7 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr, struct sg_table *sgt)
 
        if (priv->cur_sg ||
            !((intr_status & IXR_D_P_DONE_MASK) == IXR_D_P_DONE_MASK)) {
-               if (timeout == 0)
+               if (time_left == 0)
                        why = "DMA timed out";
                else
                        why = "DMA did not complete";