mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 23:52:08 +02:00
i2c: omap: 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 <wsa+renesas@sang-engineering.com> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
This commit is contained in:
parent
8dacd79fec
commit
c1f8f66467
|
|
@ -660,7 +660,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
|
|||
struct i2c_msg *msg, int stop, bool polling)
|
||||
{
|
||||
struct omap_i2c_dev *omap = i2c_get_adapdata(adap);
|
||||
unsigned long timeout;
|
||||
unsigned long time_left;
|
||||
u16 w;
|
||||
int ret;
|
||||
|
||||
|
|
@ -740,18 +740,18 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
|
|||
* into arbitration and we're currently unable to recover from it.
|
||||
*/
|
||||
if (!polling) {
|
||||
timeout = wait_for_completion_timeout(&omap->cmd_complete,
|
||||
OMAP_I2C_TIMEOUT);
|
||||
time_left = wait_for_completion_timeout(&omap->cmd_complete,
|
||||
OMAP_I2C_TIMEOUT);
|
||||
} else {
|
||||
do {
|
||||
omap_i2c_wait(omap);
|
||||
ret = omap_i2c_xfer_data(omap);
|
||||
} while (ret == -EAGAIN);
|
||||
|
||||
timeout = !ret;
|
||||
time_left = !ret;
|
||||
}
|
||||
|
||||
if (timeout == 0) {
|
||||
if (time_left == 0) {
|
||||
omap_i2c_reset(omap);
|
||||
__omap_i2c_init(omap);
|
||||
return -ETIMEDOUT;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user