i2c: rcar: use adapter default for timeout
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sat, 20 Jun 2015 19:03:19 +0000 (21:03 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 23 Jun 2015 17:50:10 +0000 (19:50 +0200)
5 seconds is a very large timeout, and it is hardcoded. Use the default
timeout from 'struct adapter' which is 1 second. It can also be modified
from userspace for specific workloads via i2c-dev.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-rcar.c

index 9eef46254369b3da58831a50af0b65f93f17cf5e..e57e520b4756a9690b255997a90b7c9b08f279e2 100644 (file)
@@ -532,7 +532,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 
                timeout = wait_event_timeout(priv->wait,
                                             rcar_i2c_flags_has(priv, ID_DONE),
-                                            5 * HZ);
+                                            adap->timeout);
                if (!timeout) {
                        ret = -ETIMEDOUT;
                        break;