xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: davinci: fixup wait_for_completion_timeout handling

Browse Source 
wait_for_completion_timeout return 0 (timeout) or >=1 (completion) so the check
for >= 0 is always true and can be dropped implying that r==-EREMOTEIO and thus
the return of -EREMOTEIO can be done in the   if (dev->buf_len)  branch.
As wait_for_completion_timeout returns unsigned long not int, and   int r   is
exclusively used for wait_for_completion_timeout it is renamed and the type
changed to unsigned long.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Nicholas Mc Guire
2015-03-17 03:51:13 -04:00
committed by Wolfram Sang
parent 9c836d0c44
commit d9e1f4417a
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/i2c/busses/i2c-davinci.c
View File

@@ -304,7 +304,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
struct davinci_i2c_platform_data *pdata = dev->pdata; struct davinci_i2c_platform_data *pdata = dev->pdata;
u32 flag; u32 flag;
u16 w; u16 w;
int r; unsigned long time_left;
/* Introduce a delay, required for some boards (e.g Davinci EVM) */ /* Introduce a delay, required for some boards (e.g Davinci EVM) */
if (pdata->bus_delay) if (pdata->bus_delay)
@@ -368,8 +368,9 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
flag |= DAVINCI_I2C_MDR_STP; flag |= DAVINCI_I2C_MDR_STP;
davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag); davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
r = wait_for_completion_timeout(&dev->cmd_complete, dev->adapter.timeout); time_left = wait_for_completion_timeout(&dev->cmd_complete,
if (r == 0) { dev->adapter.timeout);
if (!time_left) {
dev_err(dev->dev, "controller timed out\n"); dev_err(dev->dev, "controller timed out\n");
davinci_i2c_recover_bus(dev); davinci_i2c_recover_bus(dev);
i2c_davinci_init(dev); i2c_davinci_init(dev);
@@ -380,17 +381,13 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
/* This should be 0 if all bytes were transferred /* This should be 0 if all bytes were transferred
* or dev->cmd_err denotes an error. * or dev->cmd_err denotes an error.
*/ */
if (r >= 0) { dev_err(dev->dev, "abnormal termination buf_len=%i\n",
dev_err(dev->dev, "abnormal termination buf_len=%i\n", dev->buf_len);
dev->buf_len);
r = -EREMOTEIO;
}
dev->terminate = 1; dev->terminate = 1;
wmb(); wmb();
dev->buf_len = 0; dev->buf_len = 0;
return -EREMOTEIO;
} }
if (r < 0)
return r;
/* no error */ /* no error */
if (likely(!dev->cmd_err)) if (likely(!dev->cmd_err))