diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-07-20 00:05:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:12 -0700 |
| commit | 02ff982c6911de1484e13a1d765d7bd31a0f8fee (patch) | |
| tree | 94e8c388df0de6561da7f10840f4e87dead18724 /drivers/hwmon | |
| parent | 5071860aba7fc69279ab822638ed2c2e4549f9fd (diff) | |
| download | linux-3.10-02ff982c6911de1484e13a1d765d7bd31a0f8fee.tar.gz linux-3.10-02ff982c6911de1484e13a1d765d7bd31a0f8fee.tar.bz2 linux-3.10-02ff982c6911de1484e13a1d765d7bd31a0f8fee.zip | |
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (8/9)
Kill all uses of i2c_is_isa_adapter except for the hybrid drivers (it87,
lm78, w83781d). The i2c-isa adapter not being registered with the i2c
core anymore, drivers don't have to fear being erroneously attached to
it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/adm1021.c | 9 | ||||
| -rw-r--r-- | drivers/hwmon/asb100.c | 8 | ||||
| -rw-r--r-- | drivers/hwmon/lm75.c | 10 | ||||
| -rw-r--r-- | drivers/hwmon/lm85.c | 5 |
4 files changed, 0 insertions, 32 deletions
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c index 093d09cc4c1..2a341390d92 100644 --- a/drivers/hwmon/adm1021.c +++ b/drivers/hwmon/adm1021.c @@ -198,15 +198,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) int err = 0; const char *type_name = ""; - /* Make sure we aren't probing the ISA bus!! This is just a safety check - at this moment; i2c_detect really won't call us. */ -#ifdef DEBUG - if (i2c_is_isa_adapter(adapter)) { - dev_dbg(&adapter->dev, "adm1021_detect called for an ISA bus adapter?!?\n"); - return 0; - } -#endif - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto error0; diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c index d1856acf87a..290f7d2ac0a 100644 --- a/drivers/hwmon/asb100.c +++ b/drivers/hwmon/asb100.c @@ -714,14 +714,6 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind) struct i2c_client *new_client; struct asb100_data *data; - /* asb100 is SMBus only */ - if (i2c_is_isa_adapter(adapter)) { - pr_debug("asb100.o: detect failed, " - "cannot attach to legacy adapter!\n"); - err = -ENODEV; - goto ERROR0; - } - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { pr_debug("asb100.o: detect failed, " "smbus byte data not supported!\n"); diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 54dda7d11ac..a2bebb6b37a 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -121,16 +121,6 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind) int err = 0; const char *name = ""; - /* Make sure we aren't probing the ISA bus!! This is just a safety check - at this moment; i2c_detect really won't call us. */ -#ifdef DEBUG - if (i2c_is_isa_adapter(adapter)) { - dev_dbg(&adapter->dev, - "lm75_detect called for an ISA bus adapter?!?\n"); - goto exit; - } -#endif - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA)) goto exit; diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index 8954d64614f..5f051c02323 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c @@ -1033,11 +1033,6 @@ int lm85_detect(struct i2c_adapter *adapter, int address, int err = 0; const char *type_name = ""; - if (i2c_is_isa_adapter(adapter)) { - /* This chip has no ISA interface */ - goto ERROR0 ; - }; - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { /* We need to be able to do byte I/O */ |