From: Jean Delvare Date: Wed, 9 May 2007 03:27:05 +0000 (-0700) Subject: applesmc: Use standard sysfs names for labels X-Git-Tag: v2.6.22-rc1~336 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da4e8ca376a1b3dca470eba14dcec321a6a27b8b;p=linux-2.6 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 Cc: Nicolas Boichat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 5456e86088..b51c104a28 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, \ static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \ 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); \ \ 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##_output.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 \ };