hwmon: (lm63) Create all sysfs groups in one call (b76552b3) · Commits · 戴 / test

drivers/hwmon/lm63.c

+14 −28

Original line number	Original line	Diff line number	Diff line
	@@ -157,6 +157,7 @@ enum chips { lm63, lm64, lm96163 };
	struct lm63_data {		struct lm63_data {
	struct device *hwmon_dev;		struct device *hwmon_dev;
	struct mutex update_lock;		struct mutex update_lock;
			const struct attribute_group *groups[5];
	char valid; /* zero until following fields are valid */		char valid; /* zero until following fields are valid */
	char lut_valid; /* zero until lut fields are valid */		char lut_valid; /* zero until lut fields are valid */
	unsigned long last_updated; /* in jiffies */		unsigned long last_updated; /* in jiffies */
	@@ -1116,6 +1117,7 @@ static int lm63_probe(struct i2c_client *client,
	{		{
	struct device *dev = &client->dev;		struct device *dev = &client->dev;
	struct lm63_data *data;		struct lm63_data *data;
			int groups = 0;
	int err;		int err;

	data = devm_kzalloc(dev, sizeof(struct lm63_data), GFP_KERNEL);		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);		lm63_init_client(client);

	/* Register sysfs hooks */		/* Register sysfs hooks */
	err = sysfs_create_group(&dev->kobj, &lm63_group);		data->groups[groups++] = &lm63_group;
	if (err)		if (data->config & 0x04) /* tachometer enabled */
	return err;		data->groups[groups++] = &lm63_group_fan1;
	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) {		if (data->kind == lm96163) {
	err = sysfs_create_group(&dev->kobj, &lm63_group_temp2_type);		data->groups[groups++] = &lm63_group_temp2_type;
	if (err)		data->groups[groups++] = &lm63_group_extra_lut;
	goto exit_remove_files;		}

	err = sysfs_create_group(&dev->kobj, &lm63_group_extra_lut);		err = sysfs_create_groups(&dev->kobj, data->groups);
	if (err)		if (err)
	goto exit_remove_files;		return err;
	}

	data->hwmon_dev = hwmon_device_register(dev);		data->hwmon_dev = hwmon_device_register(dev);
	if (IS_ERR(data->hwmon_dev)) {		if (IS_ERR(data->hwmon_dev)) {
	@@ -1162,12 +1159,7 @@ static int lm63_probe(struct i2c_client *client,
	return 0;		return 0;

	exit_remove_files:		exit_remove_files:
	sysfs_remove_group(&dev->kobj, &lm63_group);		sysfs_remove_groups(&dev->kobj, data->groups);
	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);
	}
	return err;		return err;
	}		}

	@@ -1176,13 +1168,7 @@ static int lm63_remove(struct i2c_client *client)
	struct lm63_data *data = i2c_get_clientdata(client);		struct lm63_data *data = i2c_get_clientdata(client);

	hwmon_device_unregister(data->hwmon_dev);		hwmon_device_unregister(data->hwmon_dev);
	sysfs_remove_group(&client->dev.kobj, &lm63_group);		sysfs_remove_groups(&client->dev.kobj, data->groups);
	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);
	}

	return 0;		return 0;
	}		}

Admin message