i2c: sh_mobile: use adapter default for timeout
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sat, 20 Jun 2015 19:03:21 +0000 (21:03 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 23 Jun 2015 17:50:24 +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-sh_mobile.c

index 7193bcfdd94013ff782b77f4a2edf2b0c7f98470..5490bfb58f3e8008cf75b9f8010cf83e14363ec3 100644 (file)
@@ -751,7 +751,7 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
                /* The interrupt handler takes care of the rest... */
                k = wait_event_timeout(pd->wait,
                                       pd->sr & (ICSR_TACK | SW_DONE),
-                                      5 * HZ);
+                                      adapter->timeout);
                if (!k) {
                        dev_err(pd->dev, "Transfer request timed out\n");
                        if (pd->dma_direction != DMA_NONE)