hwmon: (adt7475) Move sysfs files
Subsystems (2)
PATCH 5/11 hwmon: (adt7475) Move sysfs files
Move sysfs files removal to a separate function. The code is common to the device probing error path and the standard device removal path. As it will grow with future driver development, this avoids code duplication.
Signed-off-by Jean Delvare <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Jordan Crouse <[email protected]>
Cc "Darrick J. Wong" <[email protected]>
--- drivers/hwmon/adt7475.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/hwmon/adt7475.c +10 -6
@@ -1109,6 +1109,14 @@ static int adt7475_detect(struct i2c_clireturn 0 ; } +static void adt7475_remove_files (struct i2c_client *client, +struct adt7475_data *data) +{ +sysfs_remove_group (&client->dev.kobj, &adt7475_attr_group); +if (data->has_voltage &0x39 ) +sysfs_remove_group (&client->dev.kobj, &adt7490_attr_group); +} +static int adt7475_probe (struct i2c_client *client,const struct i2c_device_id *id) {
@@ -1156,9 +1164,7 @@ static int adt7475_probe(struct i2c_cliereturn 0 ; eremove: -sysfs_remove_group (&client->dev.kobj, &adt7475_attr_group); -if (data->has_voltage &0x39 ) -sysfs_remove_group (&client->dev.kobj, &adt7490_attr_group); +adt7475_remove_files (client, data); efree:kfree (data);return ret;
@@ -1169,9 +1175,7 @@ static int adt7475_remove(struct i2c_clistruct adt7475_data *data =i2c_get_clientdata (client);hwmon_device_unregister (data->hwmon_dev); -sysfs_remove_group (&client->dev.kobj, &adt7475_attr_group); -if (data->has_voltage &0x39 ) -sysfs_remove_group (&client->dev.kobj, &adt7490_attr_group); +adt7475_remove_files (client, data);kfree (data);return 0 ;
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors