From: Jean Delvare These attribute names don't follow the standard, there's an extra "_" which shouldn't be there. Signed-off-by: Jean Delvare Cc: Nicolas Boichat Cc: Dmitry Torokhov Signed-off-by: Andrew Morton --- drivers/hwmon/applesmc.c | 48 ++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff -puN drivers/hwmon/applesmc.c~apple-smc-driver-hardware-monitoring-and-control-fix-names drivers/hwmon/applesmc.c --- a/drivers/hwmon/applesmc.c~apple-smc-driver-hardware-monitoring-and-control-fix-names +++ a/drivers/hwmon/applesmc.c @@ -1010,44 +1010,44 @@ static const struct attribute_group fan_ /* * Temperature sensors sysfs entries. */ -static SENSOR_DEVICE_ATTR(temp_1_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, applesmc_show_temperature, NULL, 0); -static SENSOR_DEVICE_ATTR(temp_2_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, applesmc_show_temperature, NULL, 1); -static SENSOR_DEVICE_ATTR(temp_3_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, applesmc_show_temperature, NULL, 2); -static SENSOR_DEVICE_ATTR(temp_4_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, applesmc_show_temperature, NULL, 3); -static SENSOR_DEVICE_ATTR(temp_5_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp5_input, S_IRUGO, applesmc_show_temperature, NULL, 4); -static SENSOR_DEVICE_ATTR(temp_6_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp6_input, S_IRUGO, applesmc_show_temperature, NULL, 5); -static SENSOR_DEVICE_ATTR(temp_7_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp7_input, S_IRUGO, applesmc_show_temperature, NULL, 6); -static SENSOR_DEVICE_ATTR(temp_8_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO, applesmc_show_temperature, NULL, 7); -static SENSOR_DEVICE_ATTR(temp_9_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp9_input, S_IRUGO, applesmc_show_temperature, NULL, 8); -static SENSOR_DEVICE_ATTR(temp_10_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp10_input, S_IRUGO, applesmc_show_temperature, NULL, 9); -static SENSOR_DEVICE_ATTR(temp_11_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp11_input, S_IRUGO, applesmc_show_temperature, NULL, 10); -static SENSOR_DEVICE_ATTR(temp_12_input, S_IRUGO, +static SENSOR_DEVICE_ATTR(temp12_input, S_IRUGO, applesmc_show_temperature, NULL, 11); static struct attribute *temperature_attributes[] = { - &sensor_dev_attr_temp_1_input.dev_attr.attr, - &sensor_dev_attr_temp_2_input.dev_attr.attr, - &sensor_dev_attr_temp_3_input.dev_attr.attr, - &sensor_dev_attr_temp_4_input.dev_attr.attr, - &sensor_dev_attr_temp_5_input.dev_attr.attr, - &sensor_dev_attr_temp_6_input.dev_attr.attr, - &sensor_dev_attr_temp_7_input.dev_attr.attr, - &sensor_dev_attr_temp_8_input.dev_attr.attr, - &sensor_dev_attr_temp_9_input.dev_attr.attr, - &sensor_dev_attr_temp_10_input.dev_attr.attr, - &sensor_dev_attr_temp_11_input.dev_attr.attr, - &sensor_dev_attr_temp_12_input.dev_attr.attr, + &sensor_dev_attr_temp1_input.dev_attr.attr, + &sensor_dev_attr_temp2_input.dev_attr.attr, + &sensor_dev_attr_temp3_input.dev_attr.attr, + &sensor_dev_attr_temp4_input.dev_attr.attr, + &sensor_dev_attr_temp5_input.dev_attr.attr, + &sensor_dev_attr_temp6_input.dev_attr.attr, + &sensor_dev_attr_temp7_input.dev_attr.attr, + &sensor_dev_attr_temp8_input.dev_attr.attr, + &sensor_dev_attr_temp9_input.dev_attr.attr, + &sensor_dev_attr_temp10_input.dev_attr.attr, + &sensor_dev_attr_temp11_input.dev_attr.attr, + &sensor_dev_attr_temp12_input.dev_attr.attr, NULL }; _