i2c: sh_mobile: use adapter default for timeout

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>
This commit is contained in:
Wolfram Sang 2015-06-20 21:03:21 +02:00 committed by Wolfram Sang
parent b6763d0da5
commit 41bdbd2887

View File

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