From 91d6c425d1cc5c9f40243f2e8b6589df6b835ca1 Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Sun, 24 Nov 2002 05:45:28 +0000 Subject: [PATCH] change algo-bit timeout from a number to a HZ git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1645 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/busses/i2c-i810.c | 3 ++- kernel/busses/i2c-savage4.c | 2 +- kernel/busses/i2c-tsunami.c | 2 +- kernel/busses/i2c-via.c | 2 +- kernel/busses/i2c-voodoo3.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/busses/i2c-i810.c b/kernel/busses/i2c-i810.c index 2e660d3c..7a48715a 100644 --- a/kernel/busses/i2c-i810.c +++ b/kernel/busses/i2c-i810.c @@ -63,6 +63,7 @@ static int i810_supported[] = {PCI_DEVICE_ID_INTEL_82810_IG1, PCI_DEVICE_ID_INTEL_82810_IG3, 0x7125, PCI_DEVICE_ID_INTEL_82815_2, + 0x2562, 0 }; /* GPIO register locations */ @@ -90,7 +91,7 @@ static int i810_supported[] = {PCI_DEVICE_ID_INTEL_82810_IG1, /* delays */ #define CYCLE_DELAY 10 -#define TIMEOUT 50 +#define TIMEOUT (HZ / 2) #ifdef MODULE static diff --git a/kernel/busses/i2c-savage4.c b/kernel/busses/i2c-savage4.c index 228807a9..bf9d653a 100644 --- a/kernel/busses/i2c-savage4.c +++ b/kernel/busses/i2c-savage4.c @@ -73,7 +73,7 @@ /* delays */ #define CYCLE_DELAY 10 -#define TIMEOUT 50 +#define TIMEOUT (HZ / 2) #ifdef MODULE static diff --git a/kernel/busses/i2c-tsunami.c b/kernel/busses/i2c-tsunami.c index 2f08948d..19f14b15 100644 --- a/kernel/busses/i2c-tsunami.c +++ b/kernel/busses/i2c-tsunami.c @@ -123,7 +123,7 @@ static struct i2c_algo_bit_data tsunami_i2c_bit_data = { bit_tsunami_setscl, bit_tsunami_getsda, bit_tsunami_getscl, - 10, 10, 50 /* delays/timeout */ + 10, 10, HZ/2 /* delays/timeout */ }; static struct i2c_adapter tsunami_i2c_adapter = { diff --git a/kernel/busses/i2c-via.c b/kernel/busses/i2c-via.c index 1176560d..2cb03746 100644 --- a/kernel/busses/i2c-via.c +++ b/kernel/busses/i2c-via.c @@ -114,7 +114,7 @@ static struct i2c_algo_bit_data bit_data = { bit_via_setscl, bit_via_getsda, bit_via_getscl, - 5, 5, 100, /*waits, timeout */ + 5, 5, HZ, /*waits, timeout */ }; static struct i2c_adapter bit_via_ops = { diff --git a/kernel/busses/i2c-voodoo3.c b/kernel/busses/i2c-voodoo3.c index a226641a..f4e55b84 100644 --- a/kernel/busses/i2c-voodoo3.c +++ b/kernel/busses/i2c-voodoo3.c @@ -70,7 +70,7 @@ MODULE_LICENSE("GPL"); /* delays */ #define CYCLE_DELAY 10 -#define TIMEOUT 50 +#define TIMEOUT (HZ / 2) #ifdef MODULE static