i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

I2C drivers can use the clientdata-pointer to point to private data. As I2C
devices are not really unregistered, but merely detached from their driver, it
used to be the drivers obligation to clear this pointer during remove() or a
failed probe(). As a couple of drivers forgot to do this, it was agreed that it
was cleaner if the i2c-core does this clearance when appropriate, as there is
no guarantee for the lifetime of the clientdata-pointer after remove() anyhow.
This feature was added to the core with commit
e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers.

As there is no need anymore to clear the clientdata-pointer, remove all current
occurrences in the drivers to simplify the code and prevent confusion.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Richard Purdie <rpurdie@linux.intel.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

10 files changed, 0 insertions, 18 deletions

diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c
index 4086c7257f91..f13c843a2964 100644
--- a/drivers/hwmon/adt7411.c
+++ b/drivers/hwmon/adt7411.c
@@ -316,7 +316,6 @@ static int __devinit adt7411_probe(struct i2c_client *client,
  exit_remove:
         sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);
  exit_free:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return ret;
 }
@@ -327,7 +326,6 @@ static int __devexit adt7411_remove(struct i2c_client *client)
 
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c
index 0f388adc6187..3b973f30b1f6 100644
--- a/drivers/hwmon/asc7621.c
+++ b/drivers/hwmon/asc7621.c
@@ -1141,7 +1141,6 @@ exit_remove:
                                    &(asc7621_params[i].sda.dev_attr));
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return err;
 }
@@ -1196,7 +1195,6 @@ static int asc7621_remove(struct i2c_client *client)
                                    &(asc7621_params[i].sda.dev_attr));
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index bad2cf3ef4a4..0f58ecc5334d 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -662,7 +662,6 @@ exit_remove:
         sysfs_remove_group(&client->dev.kobj, &f75375_group);
 exit_free:
         kfree(data);
-        i2c_set_clientdata(client, NULL);
         return err;
 }
 
@@ -672,7 +671,6 @@ static int f75375_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &f75375_group);
         kfree(data);
-        i2c_set_clientdata(client, NULL);
         return 0;
 }
 
diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c
index 09ea12e0a551..1f63d1a3af5e 100644
--- a/drivers/hwmon/g760a.c
+++ b/drivers/hwmon/g760a.c
@@ -236,7 +236,6 @@ error_hwmon_device_register:
         sysfs_remove_group(&client->dev.kobj, &g760a_group);
 error_sysfs_create_group:
         kfree(data);
-        i2c_set_clientdata(client, NULL);
 
         return err;
 }
@@ -247,7 +246,6 @@ static int g760a_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &g760a_group);
         kfree(data);
-        i2c_set_clientdata(client, NULL);
 
         return 0;
 }
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 4d1b76bc8148..29b9030d42c3 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -136,7 +136,6 @@ static int lm73_remove(struct i2c_client *client)
 
         hwmon_device_unregister(hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm73_group);
-        i2c_set_clientdata(client, NULL);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 56463428a419..393f354f92a4 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -192,7 +192,6 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
 exit_remove:
         sysfs_remove_group(&client->dev.kobj, &lm75_group);
 exit_free:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return status;
 }
@@ -204,7 +203,6 @@ static int lm75_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm75_group);
         lm75_write_value(client, LM75_REG_CONF, data->orig_conf);
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c
index 8fc8eb8cba47..94741d42112d 100644
--- a/drivers/hwmon/lm95241.c
+++ b/drivers/hwmon/lm95241.c
@@ -399,7 +399,6 @@ static int lm95241_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm95241_group);
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
         return 0;
 }
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 8013895a1faf..93187c3cb5e7 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -224,7 +224,6 @@ fail_remove_sysfs:
 fail_restore_config:
         tmp102_write_reg(client, TMP102_CONF_REG, tmp102->config_orig);
 fail_free:
-        i2c_set_clientdata(client, NULL);
         kfree(tmp102);
 
         return status;
@@ -247,7 +246,6 @@ static int __devexit tmp102_remove(struct i2c_client *client)
                                          config | TMP102_CONF_SD);
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(tmp102);
 
         return 0;
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 738c472ece27..6b4165c12092 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -295,7 +295,6 @@ exit_remove:
         sysfs_remove_group(&client->dev.kobj, &tmp421_group);
 
 exit_free:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 
         return err;
@@ -308,7 +307,6 @@ static int tmp421_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &tmp421_group);
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 
         return 0;
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 32d4adee73db..c84b9b4e6960 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1197,7 +1197,6 @@ ERROR4:
         if (data->lm75[1])
                 i2c_unregister_device(data->lm75[1]);
 ERROR3:
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 ERROR1:
         return err;
@@ -1219,7 +1218,6 @@ w83781d_remove(struct i2c_client *client)
         if (data->lm75[1])
                 i2c_unregister_device(data->lm75[1]);
 
-        i2c_set_clientdata(client, NULL);
         kfree(data);
 
         return 0;