4 files changed, 1 insertions, 8 deletions

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 16d82f17ae82..c42eeb43042d 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -182,7 +182,6 @@ remove_thermostat(struct i2c_client *client)
 
         thermostat = NULL;
 
-        i2c_set_clientdata(client, NULL);
         kfree(th);
 
         return 0;
@@ -400,7 +399,6 @@ static int probe_thermostat(struct i2c_client *client,
         rc = read_reg(th, CONFIG_REG);
         if (rc < 0) {
                 dev_err(&client->dev, "Thermostat failed to read config!\n");
-                i2c_set_clientdata(client, NULL);
                 kfree(th);
                 return -ENODEV;
         }
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index d8257d35afde..647c6add2193 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -107,10 +107,8 @@ static int wf_lm75_probe(struct i2c_client *client,
         i2c_set_clientdata(client, lm);
 
         rc = wf_register_sensor(&lm->sens);
-        if (rc) {
-                i2c_set_clientdata(client, NULL);
+        if (rc)
                 kfree(lm);
-        }
 
         return rc;
 }
@@ -216,7 +214,6 @@ static int wf_lm75_remove(struct i2c_client *client)
         /* release sensor */
         wf_unregister_sensor(&lm->sens);
 
-        i2c_set_clientdata(client, NULL);
         return 0;
 }
 
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index b486eb929fde..8204113268f4 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -81,7 +81,6 @@ static int wf_max6690_probe(struct i2c_client *client,
 
         rc = wf_register_sensor(&max->sens);
         if (rc) {
-                i2c_set_clientdata(client, NULL);
                 kfree(max);
         }
 
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index e20330a28959..65a8ff3e1f8e 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -376,7 +376,6 @@ static int wf_sat_remove(struct i2c_client *client)
         /* XXX TODO */
 
         sat->i2c = NULL;
-        i2c_set_clientdata(client, NULL);
         return 0;
 }