i2c: nomadik: match return type of wait_for_completion_timeout
authorNicholas Mc Guire <hofrat@osadl.org>
Sun, 8 Feb 2015 12:34:33 +0000 (07:34 -0500)
committerWolfram Sang <wsa@the-dreams.de>
Sun, 15 Mar 2015 09:50:50 +0000 (10:50 +0100)
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>
drivers/i2c/busses/i2c-nomadik.c

index 97998946c4f64b71d801539f2aa8b5583a9c7330..6ca6ad6d901a706694cc0eec8e5963ad3276c817 100644 (file)
@@ -448,7 +448,7 @@ static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)
 {
        u32 status = 0;
        u32 mcr, irq_mask;
-       int timeout;
+       unsigned long timeout;
 
        mcr = load_i2c_mcr_reg(dev, flags);
        writel(mcr, dev->virtbase + I2C_MCR);
@@ -517,7 +517,7 @@ static int write_i2c(struct nmk_i2c_dev *dev, u16 flags)
 {
        u32 status = 0;
        u32 mcr, irq_mask;
-       int timeout;
+       unsigned long timeout;
 
        mcr = load_i2c_mcr_reg(dev, flags);