Skip to content

Commit

Permalink
i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
Browse files Browse the repository at this point in the history
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@linux-fr.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Lennert Buytenhek <kernel@wantstofly.org>
Acked-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
  • Loading branch information
Jean Delvare committed Feb 24, 2009
1 parent cd97f39 commit 082a4cf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-acorn.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-ixp2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
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));
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/scx200_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
.getsda = scx200_i2c_getsda,
.getscl = scx200_i2c_getscl,
.udelay = 10,
.timeout = 100,
.timeout = HZ,
};

static struct i2c_adapter scx200_i2c_ops = {
Expand Down

0 comments on commit 082a4cf

Please sign in to comment.