i2c: rk3x: use 'time_left' variable with wait_event_timeout()

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

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

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

Fix to the proper variable type 'long' while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index 8c7367f289d364faf9037f41bdd8e495ea1c528f..beca61700c89c96bdfb9e444357e9d5fa5016850 100644 (file)
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -1060,7 +1060,8 @@ static int rk3x_i2c_xfer_common(struct i2c_adapter *adap,
                                struct i2c_msg *msgs, int num, bool polling)
 {
        struct rk3x_i2c *i2c = (struct rk3x_i2c *)adap->algo_data;
-       unsigned long timeout, flags;
+       unsigned long flags;
+       long time_left;
        u32 val;
        int ret = 0;
        int i;
@@ -1092,20 +1093,20 @@ static int rk3x_i2c_xfer_common(struct i2c_adapter *adap,
                if (!polling) {
                        rk3x_i2c_start(i2c);
 
-                       timeout = wait_event_timeout(i2c->wait, !i2c->busy,
-                                                    msecs_to_jiffies(WAIT_TIMEOUT));
+                       time_left = wait_event_timeout(i2c->wait, !i2c->busy,
+                                                      msecs_to_jiffies(WAIT_TIMEOUT));
                } else {
                        disable_irq(i2c->irq);
                        rk3x_i2c_start(i2c);
 
-                       timeout = rk3x_i2c_wait_xfer_poll(i2c);
+                       time_left = rk3x_i2c_wait_xfer_poll(i2c);
 
                        enable_irq(i2c->irq);
                }
 
                spin_lock_irqsave(&i2c->lock, flags);
 
-               if (timeout == 0) {
+               if (time_left == 0) {
                        /* Force a STOP condition without interrupt */
                        i2c_writel(i2c, 0, REG_IEN);
                        val = i2c_readl(i2c, REG_CON) & REG_CON_TUNING_MASK;