Commit fbae3fb1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jean Delvare
Browse files

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
e4a7b9b0 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: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarRichard Purdie <rpurdie@linux.intel.com>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 35bfc353

drivers/hwmon/adt7411.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/hwmon/asc7621.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/hwmon/f75375s.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/hwmon/g760a.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/hwmon/lm73.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE