i2c: Adapter timeout is in jiffies

i2c_adapter.timeout is in jiffies. Fix all drivers which thought
otherwise. It didn't really matter as long as the value was only used
inside the driver, but soon i2c-core will use it too so it must have
the proper unit.

Note: for the i2c-mpc driver, this fixes a bug in polling mode.
Timeout would trigger after 1 jiffy, which is most probably not what
the author wanted.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Clifford Wolf <clifford@clifford.at>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Mark A. Greer <mgreer@mvista.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 88f0db73b364..8b92a4666e02 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -415,7 +415,7 @@ static int iic_wait_for_tc(struct ibm_iic_private* dev){
         if (dev->irq >= 0){
                 /* Interrupt mode */
                 ret = wait_event_interruptible_timeout(dev->wq,
-                        !(in_8(&iic->sts) & STS_PT), dev->adap.timeout * HZ);
+                        !(in_8(&iic->sts) & STS_PT), dev->adap.timeout);
 
                 if (unlikely(ret < 0))
                         DBG("%d: wait interrupted\n", dev->idx);
@@ -426,7 +426,7 @@ static int iic_wait_for_tc(struct ibm_iic_private* dev){
         }
         else {
                 /* Polling mode */
-                unsigned long x = jiffies + dev->adap.timeout * HZ;
+                unsigned long x = jiffies + dev->adap.timeout;
 
                 while (in_8(&iic->sts) & STS_PT){
                         if (unlikely(time_after(jiffies, x))){
@@ -748,7 +748,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
         i2c_set_adapdata(adap, dev);
         adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adap->algo = &iic_algo;
-        adap->timeout = 1;
+        adap->timeout = HZ;
 
         ret = i2c_add_adapter(adap);
         if (ret  < 0) {