[PATCH] I2C: refactor message in i2c_detach_client

We could refactor the error message 34 different i2c drivers print if
i2c_detach_client() fails in this function itself. Saves quite a few
lines of code. Documentation is updated to reflect that change.

Note that this patch should be applied after Rudolf Marek's w83792d
patches.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

6 files changed, 6 insertions, 21 deletions

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;