aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-08 06:39:56 -0500
committerWolfram Sang <wsa@the-dreams.de>2015-03-15 05:50:28 -0400
commit1ac63fef0564d0340eaa330804df29b348204cea (patch)
tree2af37edcdfc1bb0e0d3169b669463e721cc97d64 /drivers/i2c
parent1abdd5d957e1fc789a2981d27399f56b0682f53e (diff)
i2c: imx: match return type of wait_for_completion_timeout
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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-imx.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index d7b26fc6f432..a53a7dd66945 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -601,6 +601,7 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
601 struct i2c_msg *msgs) 601 struct i2c_msg *msgs)
602{ 602{
603 int result; 603 int result;
604 unsigned long time_left;
604 unsigned int temp = 0; 605 unsigned int temp = 0;
605 unsigned long orig_jiffies = jiffies; 606 unsigned long orig_jiffies = jiffies;
606 struct imx_i2c_dma *dma = i2c_imx->dma; 607 struct imx_i2c_dma *dma = i2c_imx->dma;
@@ -624,10 +625,10 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
624 */ 625 */
625 imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR); 626 imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR);
626 reinit_completion(&i2c_imx->dma->cmd_complete); 627 reinit_completion(&i2c_imx->dma->cmd_complete);
627 result = wait_for_completion_timeout( 628 time_left = wait_for_completion_timeout(
628 &i2c_imx->dma->cmd_complete, 629 &i2c_imx->dma->cmd_complete,
629 msecs_to_jiffies(DMA_TIMEOUT)); 630 msecs_to_jiffies(DMA_TIMEOUT));
630 if (result == 0) { 631 if (time_left == 0) {
631 dmaengine_terminate_all(dma->chan_using); 632 dmaengine_terminate_all(dma->chan_using);
632 return -ETIMEDOUT; 633 return -ETIMEDOUT;
633 } 634 }
@@ -663,6 +664,7 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
663 struct i2c_msg *msgs, bool is_lastmsg) 664 struct i2c_msg *msgs, bool is_lastmsg)
664{ 665{
665 int result; 666 int result;
667 unsigned long time_left;
666 unsigned int temp; 668 unsigned int temp;
667 unsigned long orig_jiffies = jiffies; 669 unsigned long orig_jiffies = jiffies;
668 struct imx_i2c_dma *dma = i2c_imx->dma; 670 struct imx_i2c_dma *dma = i2c_imx->dma;
@@ -682,10 +684,10 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
682 return result; 684 return result;
683 685
684 reinit_completion(&i2c_imx->dma->cmd_complete); 686 reinit_completion(&i2c_imx->dma->cmd_complete);
685 result = wait_for_completion_timeout( 687 time_left = wait_for_completion_timeout(
686 &i2c_imx->dma->cmd_complete, 688 &i2c_imx->dma->cmd_complete,
687 msecs_to_jiffies(DMA_TIMEOUT)); 689 msecs_to_jiffies(DMA_TIMEOUT));
688 if (result == 0) { 690 if (time_left == 0) {
689 dmaengine_terminate_all(dma->chan_using); 691 dmaengine_terminate_all(dma->chan_using);
690 return -ETIMEDOUT; 692 return -ETIMEDOUT;
691 } 693 }