Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b76552b3 authored by Guenter Roeck's avatar Guenter Roeck Committed by Jean Delvare
Browse files

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: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
parent 2fd638fe

drivers/hwmon/lm63.c

+14 −28
Original line number Diff line number Diff line
@@ -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,23 +1137,18 @@ 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;

	}

	data->groups[groups++] = &lm63_group;

	if (data->config & 0x04)	/* tachometer enabled */

		data->groups[groups++] = &lm63_group_fan1;



	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_temp2_type;

		data->groups[groups++] = &lm63_group_extra_lut;

	}



		err = sysfs_create_group(&dev->kobj, &lm63_group_extra_lut);

	err = sysfs_create_groups(&dev->kobj, data->groups);

	if (err)

			goto exit_remove_files;

	}

		return err;



	data->hwmon_dev = hwmon_device_register(dev);

	if (IS_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;

}