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

i2c: imx: match return type of wait_for_completion_timeout

Browse Source 
return type of wait_for_completion_timeout is unsigned long not int.
An appropriate variable of type unsigned long is introduced and the
assignments fixed up.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Nicholas Mc Guire
2015-02-08 06:39:56 -05:00
committed by Wolfram Sang
parent 1abdd5d957
commit 1ac63fef05
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/i2c/busses/i2c-imx.c
View File

@@ -601,6 +601,7 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
struct i2c_msg *msgs) struct i2c_msg *msgs)
{ {
int result; int result;
unsigned long time_left;
unsigned int temp = 0; unsigned int temp = 0;
unsigned long orig_jiffies = jiffies; unsigned long orig_jiffies = jiffies;
struct imx_i2c_dma *dma = i2c_imx->dma; struct imx_i2c_dma *dma = i2c_imx->dma;
@@ -624,10 +625,10 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
*/ */
imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR); imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR);
reinit_completion(&i2c_imx->dma->cmd_complete); reinit_completion(&i2c_imx->dma->cmd_complete);
result = wait_for_completion_timeout( time_left = wait_for_completion_timeout(
&i2c_imx->dma->cmd_complete, &i2c_imx->dma->cmd_complete,
msecs_to_jiffies(DMA_TIMEOUT)); msecs_to_jiffies(DMA_TIMEOUT));
if (result == 0) { if (time_left == 0) {
dmaengine_terminate_all(dma->chan_using); dmaengine_terminate_all(dma->chan_using);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@@ -663,6 +664,7 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
struct i2c_msg *msgs, bool is_lastmsg) struct i2c_msg *msgs, bool is_lastmsg)
{ {
int result; int result;
unsigned long time_left;
unsigned int temp; unsigned int temp;
unsigned long orig_jiffies = jiffies; unsigned long orig_jiffies = jiffies;
struct imx_i2c_dma *dma = i2c_imx->dma; struct imx_i2c_dma *dma = i2c_imx->dma;
@@ -682,10 +684,10 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
return result; return result;
reinit_completion(&i2c_imx->dma->cmd_complete); reinit_completion(&i2c_imx->dma->cmd_complete);
result = wait_for_completion_timeout( time_left = wait_for_completion_timeout(
&i2c_imx->dma->cmd_complete, &i2c_imx->dma->cmd_complete,
msecs_to_jiffies(DMA_TIMEOUT)); msecs_to_jiffies(DMA_TIMEOUT));
if (result == 0) { if (time_left == 0) {
dmaengine_terminate_all(dma->chan_using); dmaengine_terminate_all(dma->chan_using);
return -ETIMEDOUT; return -ETIMEDOUT;
} }