diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2018-07-11 00:27:22 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2018-08-09 17:21:45 +0200 |
| commit | 67e73a8de8a2828661ba8c4e048e92bc183624ad (patch) | |
| tree | 9284a9f7bffeb7397e30a3773405714d1b7b7bc6 | |
| parent | d310246c026b9911093392903c52f7e2b29f0ae6 (diff) | |
| download | renesas-backport-67e73a8de8a2828661ba8c4e048e92bc183624ad.tar.gz | |
i2c: recovery: rename variable for easier understanding
While refactoring the routine before, it occurred to me that this will
make the code much easier to understand.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit f7ff75e2a88f9246dace2195e9dedd98df41d416)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | drivers/i2c/i2c-core-base.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 64535da21519d..ba113c44aab00 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -219,12 +219,12 @@ static int i2c_generic_bus_free(struct i2c_adapter *adap) static int i2c_generic_recovery(struct i2c_adapter *adap) { struct i2c_bus_recovery_info *bri = adap->bus_recovery_info; - int i = 0, val = 1, ret; + int i = 0, scl = 1, ret; if (bri->prepare_recovery) bri->prepare_recovery(adap); - bri->set_scl(adap, val); + bri->set_scl(adap, scl); if (bri->set_sda) bri->set_sda(adap, 1); ndelay(RECOVERY_NDELAY); @@ -233,7 +233,7 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) * By this time SCL is high, as we need to give 9 falling-rising edges */ while (i++ < RECOVERY_CLK_CNT * 2) { - if (val) { + if (scl) { /* SCL shouldn't be low here */ if (!bri->get_scl(adap)) { dev_err(&adap->dev, @@ -243,8 +243,8 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) } } - val = !val; - bri->set_scl(adap, val); + scl = !scl; + bri->set_scl(adap, scl); /* * If we can set SDA, we will always create STOP here to ensure @@ -254,10 +254,10 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) */ ndelay(RECOVERY_NDELAY / 2); if (bri->set_sda) - bri->set_sda(adap, val); + bri->set_sda(adap, scl); ndelay(RECOVERY_NDELAY / 2); - if (val) { + if (scl) { ret = i2c_generic_bus_free(adap); if (ret == 0) break; |