5 files changed, 5 insertions, 38 deletions

diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index e6b546dd4f7b..522ae01d2e7f 100644
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -315,11 +315,10 @@ For now, you can ignore the `flags' parameter. It is there for future use.
     const char *type_name = "";
     int is_isa = i2c_is_isa_adapter(adapter);
 
-    if (is_isa) {
+    /* Do this only if the chip can additionally be found on the ISA bus
+       (hybrid chip). */
 
-      /* If this client can't be on the ISA bus at all, we can stop now
-         (call `goto ERROR0'). But for kicks, we will assume it is all
-         right. */
+    if (is_isa) {
 
       /* Discard immediately if this ISA range is already used */
       if (check_region(address,FOO_EXTENT))
@@ -495,10 +494,10 @@ much simpler than the attachment code, fortunately!
       return err;
     }
 
-    /* SENSORS ONLY START */
+    /* HYBRID SENSORS CHIP ONLY START */
     if i2c_is_isa_client(client)
       release_region(client->addr,LM78_EXTENT);
-    /* SENSORS ONLY END */
+    /* HYBRID SENSORS CHIP ONLY END */
 
     kfree(client); /* Frees client data too, if allocated at the same time */
     return 0;
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 093d09cc4c14..2a341390d92e 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 d1856acf87a0..290f7d2ac0a8 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 54dda7d11ace..a2bebb6b37a6 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 8954d64614ff..5f051c023236 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 */