aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-05-08 23:27:05 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 23:41:14 -0400
commitda4e8ca376a1b3dca470eba14dcec321a6a27b8b (patch)
tree21ce6a5e42b872ebcdac01982d2ba4401f9d7b25
parentddfbf2afd538b38139267f71a185eb9434465440 (diff)
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: Jean Delvare <khali@linux-fr.org> Cc: Nicolas Boichat <nicolas@boichat.ch> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/hwmon/applesmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 5456e8608892..b51c104a28a2 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -981,7 +981,7 @@ static SENSOR_DEVICE_ATTR_2(fan##offset##_output, S_IRUGO | S_IWUSR, \
981static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \ 981static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \
982 applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \ 982 applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \
983\ 983\
984static SENSOR_DEVICE_ATTR(fan##offset##_position, S_IRUGO, \ 984static SENSOR_DEVICE_ATTR(fan##offset##_label, S_IRUGO, \
985 applesmc_show_fan_position, NULL, offset-1); \ 985 applesmc_show_fan_position, NULL, offset-1); \
986\ 986\
987static struct attribute *fan##offset##_attributes[] = { \ 987static struct attribute *fan##offset##_attributes[] = { \
@@ -991,7 +991,7 @@ static struct attribute *fan##offset##_attributes[] = { \
991 &sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \ 991 &sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \
992 &sensor_dev_attr_fan##offset##_output.dev_attr.attr, \ 992 &sensor_dev_attr_fan##offset##_output.dev_attr.attr, \
993 &sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \ 993 &sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \
994 &sensor_dev_attr_fan##offset##_position.dev_attr.attr, \ 994 &sensor_dev_attr_fan##offset##_label.dev_attr.attr, \
995 NULL \ 995 NULL \
996}; 996};
997 997