diff options
author | Jean Delvare <khali@linux-fr.org> | 2007-10-07 06:25:46 -0400 |
---|---|---|
committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2008-02-07 20:39:40 -0500 |
commit | 6722feada7f6213ba06d510ef853e57ddcd59dae (patch) | |
tree | 5b6f21f4b961795d3202b4ea88a7aadb80eabe1d /drivers | |
parent | 7fce084a0b3e2bb8caef919f8f36065953655bb5 (diff) |
hwmon: (lm78/w83781d) Probe fewer I2C addresses
We've never seen any device supported by the lm78 or w83781d driver at
addresses 0x20-0x27, so let's stop probing these addresses. Extra probes cost
time, and have potential for confusing or misdetecting other I2C devices.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/lm78.c | 6 | ||||
-rw-r--r-- | drivers/hwmon/w83781d.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 3f7055ee679f..934378eb4f8f 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -37,10 +37,8 @@ | |||
37 | static struct platform_device *pdev; | 37 | static struct platform_device *pdev; |
38 | 38 | ||
39 | /* Addresses to scan */ | 39 | /* Addresses to scan */ |
40 | static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, | 40 | static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, |
41 | 0x25, 0x26, 0x27, 0x28, 0x29, | 41 | 0x2e, 0x2f, I2C_CLIENT_END }; |
42 | 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, | ||
43 | 0x2f, I2C_CLIENT_END }; | ||
44 | static unsigned short isa_address = 0x290; | 42 | static unsigned short isa_address = 0x290; |
45 | 43 | ||
46 | /* Insmod parameters */ | 44 | /* Insmod parameters */ |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index e0fa7520400d..d38b9ede3abd 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
@@ -54,9 +54,8 @@ | |||
54 | static struct platform_device *pdev; | 54 | static struct platform_device *pdev; |
55 | 55 | ||
56 | /* Addresses to scan */ | 56 | /* Addresses to scan */ |
57 | static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, | 57 | static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, |
58 | 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, | 58 | 0x2e, 0x2f, I2C_CLIENT_END }; |
59 | 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; | ||
60 | static unsigned short isa_address = 0x290; | 59 | static unsigned short isa_address = 0x290; |
61 | 60 | ||
62 | /* Insmod parameters */ | 61 | /* Insmod parameters */ |
@@ -1270,7 +1269,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) | |||
1270 | kind = w83783s; | 1269 | kind = w83783s; |
1271 | else if (val1 == 0x21 && vendid == winbond) | 1270 | else if (val1 == 0x21 && vendid == winbond) |
1272 | kind = w83627hf; | 1271 | kind = w83627hf; |
1273 | else if (val1 == 0x31 && address >= 0x28) | 1272 | else if (val1 == 0x31) |
1274 | kind = as99127f; | 1273 | kind = as99127f; |
1275 | else { | 1274 | else { |
1276 | if (kind == 0) | 1275 | if (kind == 0) |