diff options
| author | Jean Delvare <khali@linux-fr.org> | 2010-03-05 22:17:16 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2010-03-05 22:17:16 +0100 |
| commit | 6a8d7acfbef8ac6bf34421eae980f903cbe36874 (patch) | |
| tree | 2e9715e0f91f4cc09e04747cc86cbc5417395d9f /drivers/hwmon/it87.c | |
| parent | 723a0aa0a10f111d7e9e0977d51ac996bf8edbbf (diff) | |
hwmon: (it87) Create vid attributes by group
Only VID-related attributes are left in it87_attributes_opt, so we
might as well rename it to it87_attributes_vid and use this group to
create all attributes at once.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 5df0824fc83..7a349e066fd 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -1107,14 +1107,14 @@ static const struct attribute_group it87_group_pwm[3] = { { .attrs = it87_attributes_pwm[2] }, }; -static struct attribute *it87_attributes_opt[] = { +static struct attribute *it87_attributes_vid[] = { &dev_attr_vrm.attr, &dev_attr_cpu0_vid.attr, NULL }; -static const struct attribute_group it87_group_opt = { - .attrs = it87_attributes_opt, +static const struct attribute_group it87_group_vid = { + .attrs = it87_attributes_vid, }; /* SuperIO detection - will change isa_address if a chip is found */ @@ -1250,7 +1250,8 @@ static void it87_remove_files(struct device *dev) continue; sysfs_remove_group(&dev->kobj, &it87_group_pwm[i]); } - sysfs_remove_group(&dev->kobj, &it87_group_opt); + if (!sio_data->skip_vid) + sysfs_remove_group(&dev->kobj, &it87_group_vid); } static int __devinit it87_probe(struct platform_device *pdev) @@ -1335,10 +1336,8 @@ static int __devinit it87_probe(struct platform_device *pdev) data->vrm = vid_which_vrm(); /* VID reading from Super-I/O config space if available */ data->vid = sio_data->vid_value; - if ((err = device_create_file(dev, - &dev_attr_vrm)) - || (err = device_create_file(dev, - &dev_attr_cpu0_vid))) + err = sysfs_create_group(&dev->kobj, &it87_group_vid); + if (err) goto ERROR4; } |