On Sun, Feb 22, 2009 at 12:50:05PM +0100, Jean Delvare wrote:
> i2c_algo_bit_data.timeout is supposed to be in jiffies, so drivers
> should use set this value in terms of HZ.
>
> Ultimately I think this field should be discarded in favor of
> i2c_adapter.timeout, but that's left for a future patch.
>
> Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Thanks.
Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
> Cc: Lennert Buytenhek <kernel@xxxxxxxxxxxxxx>
> Cc: Len Sorensen <lsorense@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-acorn.c | 2 +-
> drivers/i2c/busses/i2c-ixp2000.c | 2 +-
> drivers/i2c/busses/scx200_i2c.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> --- linux-2.6.29-rc5.orig/drivers/i2c/busses/scx200_i2c.c 2009-02-22 12:32:33.000000000 +0100
> +++ linux-2.6.29-rc5/drivers/i2c/busses/scx200_i2c.c 2009-02-22 12:32:45.000000000 +0100
> @@ -76,7 +76,7 @@ static struct i2c_algo_bit_data scx200_i
> .getsda = scx200_i2c_getsda,
> .getscl = scx200_i2c_getscl,
> .udelay = 10,
> - .timeout = 100,
> + .timeout = HZ,
> };
>
> static struct i2c_adapter scx200_i2c_ops = {
> --- linux-2.6.29-rc5.orig/drivers/i2c/busses/i2c-acorn.c 2009-02-22 12:32:33.000000000 +0100
> +++ linux-2.6.29-rc5/drivers/i2c/busses/i2c-acorn.c 2009-02-22 12:32:45.000000000 +0100
> @@ -79,7 +79,7 @@ static struct i2c_algo_bit_data ioc_data
> .getsda = ioc_getsda,
> .getscl = ioc_getscl,
> .udelay = 80,
> - .timeout = 100
> + .timeout = HZ,
> };
>
> static struct i2c_adapter ioc_ops = {
> --- linux-2.6.29-rc5.orig/drivers/i2c/busses/i2c-ixp2000.c 2009-02-22 12:32:33.000000000 +0100
> +++ linux-2.6.29-rc5/drivers/i2c/busses/i2c-ixp2000.c 2009-02-22 12:32:45.000000000 +0100
> @@ -114,7 +114,7 @@ static int ixp2000_i2c_probe(struct plat
> drv_data->algo_data.getsda = ixp2000_bit_getsda;
> drv_data->algo_data.getscl = ixp2000_bit_getscl;
> drv_data->algo_data.udelay = 6;
> - drv_data->algo_data.timeout = 100;
> + drv_data->algo_data.timeout = HZ;
>
> strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
> sizeof(drv_data->adapter.name));
>
>
> --
> Jean Delvare
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
