diff options
| author | Jean Delvare <khali@linux-fr.org> | 2009-03-28 21:34:43 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-03-28 21:34:43 +0100 |
| commit | 8fcfef6e65c5b58e6482eae0b793319c8d9efd44 (patch) | |
| tree | a41ba5854513ce8492620432920de7e6ad5698d1 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | 154d22b04ae1741c5fcfd5d747b813a9a279abff (diff) | |
| download | blackbird-op-linux-8fcfef6e65c5b58e6482eae0b793319c8d9efd44.tar.gz blackbird-op-linux-8fcfef6e65c5b58e6482eae0b793319c8d9efd44.zip | |
i2c: Set a default timeout value for all adapters
Setting a default timeout value on a per-algo basis doesn't make any
sense. Move the default value setting to i2c-core. Individual adapter
drivers can specify a different (non-zero) value if they wish.
Also express the timeout value in a way which results in the same
duration regarless of the value of HZ.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-bit.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index eb8f72ca02f4..d420cc5f5633 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -604,9 +604,7 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap) /* register new adapter to i2c module... */ adap->algo = &i2c_bit_algo; - - adap->timeout = 100; /* default values, should */ - adap->retries = 3; /* be replaced by defines */ + adap->retries = 3; return 0; } |
