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

Commit fdf241a8 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

hwmon: (ads1015) Drop dynamic attribute group 



It is cheaper to handle attributes individually.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarDirk Eibach <eibach@gdsys.de>
parent 8c22a8f5

drivers/hwmon/ads1015.c

+18 −32
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ static const unsigned int fullscale_table[8] = { 
struct ads1015_data {

	struct device *hwmon_dev;

	struct mutex update_lock; /* mutex protect updates */

	struct attribute *attr_table[ADS1015_CONFIG_CHANNELS + 1];

	struct attribute_group attr_group;

};



static s32 ads1015_read_reg(struct i2c_client *client, unsigned int reg)
@@ -141,28 +139,15 @@ static ssize_t show_in(struct device *dev, struct device_attribute *da, 
	return (res < 0) ? res : sprintf(buf, "%d\n", in);

}



#define in_reg(offset)\

static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in,\

	NULL, offset)



in_reg(0);

in_reg(1);

in_reg(2);

in_reg(3);

in_reg(4);

in_reg(5);

in_reg(6);

in_reg(7);



static struct attribute *all_attributes[] = {

	&sensor_dev_attr_in0_input.dev_attr.attr,

	&sensor_dev_attr_in1_input.dev_attr.attr,

	&sensor_dev_attr_in2_input.dev_attr.attr,

	&sensor_dev_attr_in3_input.dev_attr.attr,

	&sensor_dev_attr_in4_input.dev_attr.attr,

	&sensor_dev_attr_in5_input.dev_attr.attr,

	&sensor_dev_attr_in6_input.dev_attr.attr,

	&sensor_dev_attr_in7_input.dev_attr.attr,

static const struct sensor_device_attribute ads1015_in[] = {

	SENSOR_ATTR(in0_input, S_IRUGO, show_in, NULL, 0),

	SENSOR_ATTR(in1_input, S_IRUGO, show_in, NULL, 1),

	SENSOR_ATTR(in2_input, S_IRUGO, show_in, NULL, 2),

	SENSOR_ATTR(in3_input, S_IRUGO, show_in, NULL, 3),

	SENSOR_ATTR(in4_input, S_IRUGO, show_in, NULL, 4),

	SENSOR_ATTR(in5_input, S_IRUGO, show_in, NULL, 5),

	SENSOR_ATTR(in6_input, S_IRUGO, show_in, NULL, 6),

	SENSOR_ATTR(in7_input, S_IRUGO, show_in, NULL, 7),

};



/*
@@ -172,8 +157,11 @@ static struct attribute *all_attributes[] = { 
static int ads1015_remove(struct i2c_client *client)

{

	struct ads1015_data *data = i2c_get_clientdata(client);

	int k;



	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &data->attr_group);

	for (k = 0; k < ADS1015_CONFIG_CHANNELS; ++k)

		device_remove_file(&client->dev, &ads1015_in[k].dev_attr);

	kfree(data);

	return 0;

}
@@ -210,7 +198,6 @@ static int ads1015_probe(struct i2c_client *client, 
	int err;

	unsigned int exported_channels;

	unsigned int k;

	unsigned int n = 0;



	data = kzalloc(sizeof(struct ads1015_data), GFP_KERNEL);

	if (!data) {
@@ -222,16 +209,14 @@ static int ads1015_probe(struct i2c_client *client, 
	mutex_init(&data->update_lock);



	/* build sysfs attribute group */

	data->attr_group.attrs = data->attr_table;

	exported_channels = ads1015_get_exported_channels(client);

	for (k = 0; k < ADS1015_CONFIG_CHANNELS; ++k) {

		if (!(exported_channels & (1<<k)))

			continue;

		data->attr_table[n++] = all_attributes[k];

	}

	err = sysfs_create_group(&client->dev.kobj, &data->attr_group);

		err = device_create_file(&client->dev, &ads1015_in[k].dev_attr);

		if (err)

			goto exit_free;

	}



	data->hwmon_dev = hwmon_device_register(&client->dev);

	if (IS_ERR(data->hwmon_dev)) {
@@ -242,7 +227,8 @@ static int ads1015_probe(struct i2c_client *client, 
	return 0;



exit_remove:

	sysfs_remove_group(&client->dev.kobj, &data->attr_group);

	for (k = 0; k < ADS1015_CONFIG_CHANNELS; ++k)

		device_remove_file(&client->dev, &ads1015_in[k].dev_attr);

exit_free:

	kfree(data);

exit: