hwmon: (lm63) Create all sysfs groups in one call
Guenter Roeck
maintainerPATCH v2 3/4 hwmon: (lm63) Create all sysfs groups in one call
We can create all sysfs groups in one call by using sysfs_create_groups instead of using sysfs_create_group individually for each group.
Signed-off-by Guenter Roeck <[email protected]>
---
v2: Handle newly introduced group for temp2_type
drivers/hwmon/lm63.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-)
drivers/hwmon/lm63.c +14 -28
@@ -157,6 +157,7 @@ enum chips { lm63, lm64, lm96163 };struct lm63_data {struct device *hwmon_dev;struct mutex update_lock; +const struct attribute_group *groups[5 ];char valid;/* zero until following fields are valid */ char lut_valid;/* zero until lut fields are valid */ unsigned long last_updated;/* in jiffies */
@@ -1116,6 +1117,7 @@ static int lm63_probe(struct i2c_client *client, {struct device *dev = &client->dev;struct lm63_data *data; +int groups =0 ;int err; data =devm_kzalloc (dev,sizeof (struct lm63_data ),GFP_KERNEL );
@@ -1135,24 +1137,19 @@ static int lm63_probe(struct i2c_client *client,lm63_init_client (client);/* Register sysfs hooks */ - err =sysfs_create_group (&dev->kobj, &lm63_group); -if (err) -return err; -if (data->config &0x04 ) {/* tachometer enabled */ - err =sysfs_create_group (&dev->kobj, &lm63_group_fan1); -if (err) - goto exit_remove_files; - } -if (data->kind = lm96163) { - err =sysfs_create_group (&dev->kobj, &lm63_group_temp2_type); -if (err) - goto exit_remove_files; + data->groups[groups++] = &lm63_group; +if (data->config &0x04 )/* tachometer enabled */ + data->groups[groups++] = &lm63_group_fan1; - err =sysfs_create_group (&dev->kobj, &lm63_group_extra_lut); -if (err) - goto exit_remove_files; +if (data->kind = lm96163) { + data->groups[groups++] = &lm63_group_temp2_type; + data->groups[groups++] = &lm63_group_extra_lut; } + err =sysfs_create_groups (&dev->kobj, data->groups); +if (err) +return err; + data->hwmon_dev =hwmon_device_register (dev);if (IS_ERR (data->hwmon_dev)) { err =PTR_ERR (data->hwmon_dev);
@@ -1162,12 +1159,7 @@ static int lm63_probe(struct i2c_client *client,return 0 ; exit_remove_files: -sysfs_remove_group (&dev->kobj, &lm63_group); -sysfs_remove_group (&dev->kobj, &lm63_group_fan1); -if (data->kind = lm96163) { -sysfs_remove_group (&dev->kobj, &lm63_group_temp2_type); -sysfs_remove_group (&dev->kobj, &lm63_group_extra_lut); - } +sysfs_remove_groups (&dev->kobj, data->groups);return err; }
@@ -1176,13 +1168,7 @@ static int lm63_remove(struct i2c_client *client)struct lm63_data *data =i2c_get_clientdata (client);hwmon_device_unregister (data->hwmon_dev); -sysfs_remove_group (&client->dev.kobj, &lm63_group); -sysfs_remove_group (&client->dev.kobj, &lm63_group_fan1); -if (data->kind = lm96163) { -sysfs_remove_group (&client->dev.kobj, &lm63_group_temp2_type); -sysfs_remove_group (&client->dev.kobj, &lm63_group_extra_lut); - } - +sysfs_remove_groups (&client->dev.kobj, data->groups);return 0 ; }
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Jean Delvare
AppliedQuoted 10 lines · Guenter Roeck
We can create all sysfs groups in one call by using
sysfs_create_groupsinstead of usingsysfs_create_groupindividually for each group.Signed-off-by Guenter Roeck <[email protected]>---
v2: Handle newly introduced group fortemp2_typedrivers/hwmon/lm63.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-)(...)
Applied, thanks.
Signature · 7 lines
Jean Delvare Suse L3 Support _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors