Commit da4e8ca3 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds

applesmc: Use standard sysfs names for labels

We have a standard suffix to associate a designation string to a sensor:
_label.  Use it instead of _position so that libsensors will catch it.
(This isn't implemented yet, but should be soon.)
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ddfbf2af
...@@ -981,7 +981,7 @@ static SENSOR_DEVICE_ATTR_2(fan##offset##_output, S_IRUGO | S_IWUSR, \ ...@@ -981,7 +981,7 @@ static SENSOR_DEVICE_ATTR_2(fan##offset##_output, S_IRUGO | S_IWUSR, \
static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \
applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \ applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \
\ \
static SENSOR_DEVICE_ATTR(fan##offset##_position, S_IRUGO, \ static SENSOR_DEVICE_ATTR(fan##offset##_label, S_IRUGO, \
applesmc_show_fan_position, NULL, offset-1); \ applesmc_show_fan_position, NULL, offset-1); \
\ \
static struct attribute *fan##offset##_attributes[] = { \ static struct attribute *fan##offset##_attributes[] = { \
...@@ -991,7 +991,7 @@ static struct attribute *fan##offset##_attributes[] = { \ ...@@ -991,7 +991,7 @@ static struct attribute *fan##offset##_attributes[] = { \
&sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \ &sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_output.dev_attr.attr, \ &sensor_dev_attr_fan##offset##_output.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \ &sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_position.dev_attr.attr, \ &sensor_dev_attr_fan##offset##_label.dev_attr.attr, \
NULL \ NULL \
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment