35 files changed, 39 insertions, 133 deletions

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 2a341390d92e..da3e2c9f705f 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -328,10 +328,8 @@ static int adm1021_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index bdba01e2f3ed..181dadf42002 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -517,11 +517,8 @@ static int adm1025_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index d52100027665..82edf286ebdc 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -645,11 +645,8 @@ static int adm9240_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                                "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 290f7d2ac0a8..c6a2c94fad36 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -867,11 +867,8 @@ static int asb100_detach_client(struct i2c_client *client)
         if (data)
                 hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "client deregistration failed; "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         /* main client */
         if (data)
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 4a316a7f7980..3ac37e95d2ef 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -282,11 +282,8 @@ static int ds1621_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
 
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index c7caa95c643b..ddf22fbf4ed1 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -383,11 +383,8 @@ static int fscher_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index fd75e444e758..489870ad6056 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -549,11 +549,8 @@ static int fscpos_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, client"
-                                                        " not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 34d85b1e5539..63a2756c283a 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -492,11 +492,8 @@ static int gl518_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index b129d153deab..ff71eb7ac681 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -654,11 +654,8 @@ static int gl520_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 0a8d795f15c2..b1719f4097ef 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -945,11 +945,8 @@ static int it87_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         if(i2c_is_isa_client(client))
                 release_region(client->addr, IT87_EXTENT);
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index e19b11fd4816..736126d73aa2 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -520,11 +520,8 @@ static int lm63_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 784935f77016..21b767a66bbd 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -683,11 +683,8 @@ static int lm78_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         if(i2c_is_isa_client(client))
                 release_region(client->addr, LM78_EXTENT);
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index fa2cb17018cc..36a0cda36a7d 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -510,11 +510,8 @@ static int lm80_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 0223b4d2ce1d..f3557f8826a9 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -363,11 +363,8 @@ static int lm83_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 1dc3bf52b40d..f0ffe58e3670 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -734,11 +734,8 @@ static int lm87_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 4b914ec205fa..fbf9dac41ee5 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -562,11 +562,8 @@ static int lm90_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 9c43120d6bd7..9740ee264051 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -399,11 +399,8 @@ static int lm92_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 5f0376575c62..a53d7df92ba2 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -322,11 +322,8 @@ static int max1619_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 4041488de6f1..1f1b3ca23f6f 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -984,11 +984,8 @@ static int pc87360_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((i = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((i = i2c_detach_client(client)))
                 return i;
-        }
 
         for (i = 0; i < 3; i++) {
                 if (data->address[i]) {
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 67246299a308..55716cb579aa 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -618,11 +618,8 @@ static int sis5595_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SIS5595_EXTENT);
 
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index dddc94a7649b..7fe71576dea4 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -214,11 +214,8 @@ static int smsc47b397_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SMSC_EXTENT);
         kfree(data);
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 8126fdd7cbee..9da5d546e861 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -497,11 +497,8 @@ static int smsc47m1_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SMSC_EXTENT);
         kfree(data);
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index cd3732c36671..d9251fb0b625 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -700,11 +700,8 @@ static int via686a_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, VIA686A_EXTENT);
         kfree(data);
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index b14801cd615d..b60efe8f8b26 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -774,11 +774,8 @@ static int w83627ehf_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
         release_region(client->addr, REGION_LENGTH);
         kfree(data);
 
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 9e31f5559ccc..f1ae0e00691b 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -1157,11 +1157,8 @@ static int w83627hf_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, WINB_EXTENT);
         kfree(data);
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 70718559de75..66835c1e3f68 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1299,11 +1299,8 @@ w83781d_detach_client(struct i2c_client *client)
         if (i2c_is_isa_client(client))
                 release_region(client->addr, W83781D_EXTENT);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         /* main client */
         if (data)
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 05f9b92ad3e7..ea0c3519e03a 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -1396,11 +1396,8 @@ w83792d_detach_client(struct i2c_client *client)
         if (data)
                 hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         /* main client */
         if (data)
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 9cd1939cd040..213fb170d397 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -267,11 +267,8 @@ static int w83l785ts_detach_client(struct i2c_client *client)
 
         hwmon_device_unregister(data->class_dev);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(data);
         return 0;
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 6ac0a6e00769..8ab4e2348cda 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -353,11 +353,8 @@ static int ds1337_detach_client(struct i2c_client *client)
         int err;
         struct ds1337_data *data = i2c_get_clientdata(client);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         list_del(&data->list);
         kfree(data);
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index 88f83bac3845..9466ada68932 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -230,10 +230,8 @@ static int eeprom_detach_client(struct i2c_client *client)
         int err;
 
         err = i2c_detach_client(client);
-        if (err) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if (err)
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
 
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index d1d48586b90e..52fd6bf29133 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -242,10 +242,8 @@ static int max6875_detach_client(struct i2c_client *client)
         int err;
 
         err = i2c_detach_client(client);
-        if (err) {
-                dev_err(&client->dev, "i2c_detach_client() failed\n");
+        if (err)
                 return err;
-        }
         kfree(i2c_get_clientdata(client));
         return 0;
 }
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index c5b052363d9a..1500b1842ce5 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -163,10 +163,8 @@ static int pca9539_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index 7a1fa7914630..a109dfd3dbe7 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -185,11 +185,8 @@ static int pcf8574_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index 225b512dd4ad..7fce0fc048d9 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -240,11 +240,8 @@ static int pcf8591_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 7a7837ae3114..b0bceb2fb8b1 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -449,8 +449,12 @@ int i2c_detach_client(struct i2c_client *client)
         struct i2c_adapter *adapter = client->adapter;
         int res = 0;
         
-        if ((client->flags & I2C_CLIENT_ALLOW_USE) && (client->usage_count > 0))
+        if ((client->flags & I2C_CLIENT_ALLOW_USE)
+         && (client->usage_count > 0)) {
+                dev_warn(&client->dev, "Client [%s] still busy, "
+                         "can't detach\n", client->name);
                 return -EBUSY;
+        }
 
         if (adapter->client_unregister)  {
                 res = adapter->client_unregister(client);