aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-08 07:34:33 -0500
committerWolfram Sang <wsa@the-dreams.de>2015-03-15 05:50:50 -0400
commit9bb9fee9e9423082ff23f21257bfc68b5eacd504 (patch)
treea4e2a46f81df507632c863f7bdb526b94afc17cd /drivers/i2c
parent1ac63fef0564d0340eaa330804df29b348204cea (diff)
i2c: nomadik: match return type of wait_for_completion_timeout
return type of wait_for_completion_timeout is unsigned long not int. as timeout is used for wait_for_completion_timeout exclusively here its type is simply changed to unsigned long. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 97998946c4f6..6ca6ad6d901a 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -448,7 +448,7 @@ static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)
448{ 448{
449 u32 status = 0; 449 u32 status = 0;
450 u32 mcr, irq_mask; 450 u32 mcr, irq_mask;
451 int timeout; 451 unsigned long timeout;
452 452
453 mcr = load_i2c_mcr_reg(dev, flags); 453 mcr = load_i2c_mcr_reg(dev, flags);
454 writel(mcr, dev->virtbase + I2C_MCR); 454 writel(mcr, dev->virtbase + I2C_MCR);
@@ -517,7 +517,7 @@ static int write_i2c(struct nmk_i2c_dev *dev, u16 flags)
517{ 517{
518 u32 status = 0; 518 u32 status = 0;
519 u32 mcr, irq_mask; 519 u32 mcr, irq_mask;
520 int timeout; 520 unsigned long timeout;
521 521
522 mcr = load_i2c_mcr_reg(dev, flags); 522 mcr = load_i2c_mcr_reg(dev, flags);
523 523