Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: (coretemp) Use sysfs_create_group to create sysfs attributes

Browse Source 
Instead of creating each attribute individually, use sysfs_create_group
to create all attributes for one core with a single call.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Tested-by: Jean Delvare <jdelvare@suse.de>
This commit is contained in:
Guenter Roeck 2014-02-16 13:23:25 -08:00
parent 4fa6cbb1b8
commit 1075305de4
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/hwmon/coretemp.c
View File

@ -94,6 +94,8 @@ struct temp_data {
bool valid; bool valid;
struct sensor_device_attribute sd_attrs[TOTAL_ATTRS]; struct sensor_device_attribute sd_attrs[TOTAL_ATTRS];
char attr_name[TOTAL_ATTRS][CORETEMP_NAME_LENGTH]; char attr_name[TOTAL_ATTRS][CORETEMP_NAME_LENGTH];
struct attribute *attrs[TOTAL_ATTRS + 1];
struct attribute_group attr_group;
struct mutex update_lock; struct mutex update_lock;
}; };
@ -406,7 +408,7 @@ static int create_name_attr(struct platform_data *pdata,
static int create_core_attrs(struct temp_data *tdata, struct device *dev, static int create_core_attrs(struct temp_data *tdata, struct device *dev,
int attr_no) int attr_no)
{ {
int err, i; int i;
static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev, static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
struct device_attribute *devattr, char *buf) = { struct device_attribute *devattr, char *buf) = {
show_label, show_crit_alarm, show_temp, show_tjmax, show_label, show_crit_alarm, show_temp, show_tjmax,
@ -424,16 +426,10 @@ static int create_core_attrs(struct temp_data *tdata, struct device *dev,
tdata->sd_attrs[i].dev_attr.attr.mode = S_IRUGO; tdata->sd_attrs[i].dev_attr.attr.mode = S_IRUGO;
tdata->sd_attrs[i].dev_attr.show = rd_ptr[i]; tdata->sd_attrs[i].dev_attr.show = rd_ptr[i];
tdata->sd_attrs[i].index = attr_no; tdata->sd_attrs[i].index = attr_no;
err = device_create_file(dev, &tdata->sd_attrs[i].dev_attr); tdata->attrs[i] = &tdata->sd_attrs[i].dev_attr.attr;
if (err)
goto exit_free;
} }
return 0; tdata->attr_group.attrs = tdata->attrs;
return sysfs_create_group(&dev->kobj, &tdata->attr_group);
exit_free:
while (--i >= 0)
device_remove_file(dev, &tdata->sd_attrs[i].dev_attr);
return err;
} }
@ -575,12 +571,10 @@ static void coretemp_add_core(unsigned int cpu, int pkg_flag)
static void coretemp_remove_core(struct platform_data *pdata, static void coretemp_remove_core(struct platform_data *pdata,
struct device *dev, int indx) struct device *dev, int indx)
{ {
int i;
struct temp_data *tdata = pdata->core_data[indx]; struct temp_data *tdata = pdata->core_data[indx];
/* Remove the sysfs attributes */ /* Remove the sysfs attributes */
for (i = 0; i < tdata->attr_size; i++) sysfs_remove_group(&dev->kobj, &tdata->attr_group);
device_remove_file(dev, &tdata->sd_attrs[i].dev_attr);
kfree(pdata->core_data[indx]); kfree(pdata->core_data[indx]);
pdata->core_data[indx] = NULL; pdata->core_data[indx] = NULL;