diff --git a/lib/chips.c b/lib/chips.c index 76f3a3fa..d466f8f2 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -740,114 +740,114 @@ static sensors_chip_feature lm90_features[] = static sensors_chip_feature w83781d_features[] = { { SENSORS_W83781D_IN0, "in0", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN0, VALUE(3), 2, "in_input0", 3 }, + R, W83781D_SYSCTL_IN0, VALUE(3), 2 }, { SENSORS_W83781D_IN1, "in1", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN1, VALUE(3), 2, "in_input1", 3 }, + R, W83781D_SYSCTL_IN1, VALUE(3), 2 }, { SENSORS_W83781D_IN2, "in2", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN2, VALUE(3), 2, "in_input2", 3 }, + R, W83781D_SYSCTL_IN2, VALUE(3), 2 }, { SENSORS_W83781D_IN3, "in3", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN3, VALUE(3), 2, "in_input3", 3 }, + R, W83781D_SYSCTL_IN3, VALUE(3), 2 }, { SENSORS_W83781D_IN4, "in4", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN4, VALUE(3), 2, "in_input4", 3 }, + R, W83781D_SYSCTL_IN4, VALUE(3), 2 }, { SENSORS_W83781D_IN5, "in5", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN5, VALUE(3), 2, "in_input5", 3 }, + R, W83781D_SYSCTL_IN5, VALUE(3), 2 }, { SENSORS_W83781D_IN6, "in6", NOMAP, NOMAP, - R, W83781D_SYSCTL_IN6, VALUE(3), 2, "in_input6", 3 }, + R, W83781D_SYSCTL_IN6, VALUE(3), 2 }, { SENSORS_W83781D_IN0_MIN, "in0_min", SENSORS_W83781D_IN0, SENSORS_W83781D_IN0, RW, - W83781D_SYSCTL_IN0, VALUE(1), 2, "in_min0", 3 }, + W83781D_SYSCTL_IN0, VALUE(1), 2 }, { SENSORS_W83781D_IN1_MIN, "in1_min", SENSORS_W83781D_IN1, SENSORS_W83781D_IN1, RW, - W83781D_SYSCTL_IN1, VALUE(1), 2, "in_min1", 3 }, + W83781D_SYSCTL_IN1, VALUE(1), 2 }, { SENSORS_W83781D_IN2_MIN, "in2_min", SENSORS_W83781D_IN2, SENSORS_W83781D_IN2, RW, - W83781D_SYSCTL_IN2, VALUE(1), 2, "in_min2", 3 }, + W83781D_SYSCTL_IN2, VALUE(1), 2 }, { SENSORS_W83781D_IN3_MIN, "in3_min", SENSORS_W83781D_IN3, SENSORS_W83781D_IN3, RW, - W83781D_SYSCTL_IN3, VALUE(1), 2, "in_min3", 3 }, + W83781D_SYSCTL_IN3, VALUE(1), 2 }, { SENSORS_W83781D_IN4_MIN, "in4_min", SENSORS_W83781D_IN4, SENSORS_W83781D_IN4, RW, - W83781D_SYSCTL_IN4, VALUE(1), 2, "in_min4", 3 }, + W83781D_SYSCTL_IN4, VALUE(1), 2 }, /* swap 5 and 6 min/max because compute lines will be inverting */ { SENSORS_W83781D_IN5_MIN, "in5_min", SENSORS_W83781D_IN5, SENSORS_W83781D_IN5, RW, - W83781D_SYSCTL_IN5, VALUE(2), 2, "in_min5", 3 }, + W83781D_SYSCTL_IN5, VALUE(2), 2 }, { SENSORS_W83781D_IN6_MIN, "in6_min", SENSORS_W83781D_IN6, SENSORS_W83781D_IN6, RW, - W83781D_SYSCTL_IN6, VALUE(2), 2, "in_min6", 3 }, + W83781D_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_W83781D_IN0_MAX, "in0_max", SENSORS_W83781D_IN0, SENSORS_W83781D_IN0, RW, - W83781D_SYSCTL_IN0, VALUE(2), 2, "in_max0", 3 }, + W83781D_SYSCTL_IN0, VALUE(2), 2 }, { SENSORS_W83781D_IN1_MAX, "in1_max", SENSORS_W83781D_IN1, SENSORS_W83781D_IN1, RW, - W83781D_SYSCTL_IN1, VALUE(2), 2, "in_max1", 3 }, + W83781D_SYSCTL_IN1, VALUE(2), 2 }, { SENSORS_W83781D_IN2_MAX, "in2_max", SENSORS_W83781D_IN2, SENSORS_W83781D_IN2, RW, - W83781D_SYSCTL_IN2, VALUE(2), 2, "in_max2", 3 }, + W83781D_SYSCTL_IN2, VALUE(2), 2 }, { SENSORS_W83781D_IN3_MAX, "in3_max", SENSORS_W83781D_IN3, SENSORS_W83781D_IN3, RW, - W83781D_SYSCTL_IN3, VALUE(2), 2, "in_max3", 3 }, + W83781D_SYSCTL_IN3, VALUE(2), 2 }, { SENSORS_W83781D_IN4_MAX, "in4_max", SENSORS_W83781D_IN4, SENSORS_W83781D_IN4, RW, - W83781D_SYSCTL_IN4, VALUE(2), 2, "in_max4", 3 }, + W83781D_SYSCTL_IN4, VALUE(2), 2 }, { SENSORS_W83781D_IN5_MAX, "in5_max", SENSORS_W83781D_IN5, SENSORS_W83781D_IN5, RW, - W83781D_SYSCTL_IN5, VALUE(1), 2, "in_max5", 3 }, + W83781D_SYSCTL_IN5, VALUE(1), 2 }, { SENSORS_W83781D_IN6_MAX, "in6_max", SENSORS_W83781D_IN6, SENSORS_W83781D_IN6, RW, - W83781D_SYSCTL_IN6, VALUE(1), 2, "in_max6", 3 }, + W83781D_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_W83781D_FAN1, "fan1", NOMAP, NOMAP, - R, W83781D_SYSCTL_FAN1, VALUE(2), 0, "fan_input1" }, + R, W83781D_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_W83781D_FAN2, "fan2", NOMAP, NOMAP, - R, W83781D_SYSCTL_FAN2, VALUE(2), 0, "fan_input2" }, + R, W83781D_SYSCTL_FAN2, VALUE(2), 0 }, { SENSORS_W83781D_FAN3, "fan3", NOMAP, NOMAP, - R, W83781D_SYSCTL_FAN3, VALUE(2), 0, "fan_input3" }, + R, W83781D_SYSCTL_FAN3, VALUE(2), 0 }, { SENSORS_W83781D_FAN1_MIN, "fan1_min", SENSORS_W83781D_FAN1, SENSORS_W83781D_FAN1, RW, - W83781D_SYSCTL_FAN1, VALUE(1), 0, "fan_min1" }, + W83781D_SYSCTL_FAN1, VALUE(1), 0 }, { SENSORS_W83781D_FAN2_MIN, "fan2_min", SENSORS_W83781D_FAN2, SENSORS_W83781D_FAN2, RW, - W83781D_SYSCTL_FAN2, VALUE(1), 0, "fan_min2" }, + W83781D_SYSCTL_FAN2, VALUE(1), 0 }, { SENSORS_W83781D_FAN3_MIN, "fan3_min", SENSORS_W83781D_FAN3, SENSORS_W83781D_FAN3, RW, - W83781D_SYSCTL_FAN3, VALUE(1), 0, "fan_min3" }, + W83781D_SYSCTL_FAN3, VALUE(1), 0 }, { SENSORS_W83781D_TEMP1, "temp1", NOMAP, NOMAP, - R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 }, + R, W83781D_SYSCTL_TEMP1, VALUE(3), 1 }, { SENSORS_W83781D_TEMP1_HYST, "temp1_hyst", SENSORS_W83781D_TEMP1, SENSORS_W83781D_TEMP1, RW, - W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_min1", 2 }, + W83781D_SYSCTL_TEMP1, VALUE(2), 1 }, { SENSORS_W83781D_TEMP1_OVER, "temp1_over", SENSORS_W83781D_TEMP1, SENSORS_W83781D_TEMP1, RW, - W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 }, + W83781D_SYSCTL_TEMP1, VALUE(1), 1 }, { SENSORS_W83781D_TEMP2, "temp2", NOMAP, NOMAP, - R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 }, + R, W83781D_SYSCTL_TEMP2, VALUE(3), 1 }, { SENSORS_W83781D_TEMP2_HYST, "temp2_hyst", SENSORS_W83781D_TEMP2, SENSORS_W83781D_TEMP2, RW, - W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_min2", 2 }, + W83781D_SYSCTL_TEMP2, VALUE(2), 1 }, { SENSORS_W83781D_TEMP2_OVER, "temp2_over", SENSORS_W83781D_TEMP2, SENSORS_W83781D_TEMP2, RW, - W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 }, + W83781D_SYSCTL_TEMP2, VALUE(1), 1 }, { SENSORS_W83781D_TEMP3, "temp3", NOMAP, NOMAP, - R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 }, + R, W83781D_SYSCTL_TEMP3, VALUE(3), 1 }, { SENSORS_W83781D_TEMP3_HYST, "temp3_hyst", SENSORS_W83781D_TEMP3, SENSORS_W83781D_TEMP3, RW, - W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_min3", 2 }, + W83781D_SYSCTL_TEMP3, VALUE(2), 1 }, { SENSORS_W83781D_TEMP3_OVER, "temp3_over", SENSORS_W83781D_TEMP3, SENSORS_W83781D_TEMP3, RW, - W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 }, + W83781D_SYSCTL_TEMP3, VALUE(1), 1 }, { SENSORS_W83781D_VID, "vid", NOMAP, NOMAP, R, W83781D_SYSCTL_VID, VALUE(1), 3 }, { SENSORS_W83781D_VRM, "vrm", NOMAP, NOMAP, RW, W83781D_SYSCTL_VRM, VALUE(1), 1 }, { SENSORS_W83781D_FAN1_DIV, "fan1_div", SENSORS_W83781D_FAN1, NOMAP, RW, - W83781D_SYSCTL_FAN_DIV, VALUE(1), 0, "fan_div1" }, + W83781D_SYSCTL_FAN_DIV, VALUE(1), 0 }, { SENSORS_W83781D_FAN2_DIV, "fan2_div", SENSORS_W83781D_FAN2, NOMAP, RW, - W83781D_SYSCTL_FAN_DIV, VALUE(2), 0, "fan_div2" }, + W83781D_SYSCTL_FAN_DIV, VALUE(2), 0 }, { SENSORS_W83781D_FAN3_DIV, "fan3_div", SENSORS_W83781D_FAN3, NOMAP, RW, - W83781D_SYSCTL_FAN_DIV, VALUE(3), 0, "fan_div3" }, + W83781D_SYSCTL_FAN_DIV, VALUE(3), 0 }, { SENSORS_W83781D_ALARMS, "alarms", NOMAP, NOMAP, R, W83781D_SYSCTL_ALARMS, VALUE(1), 0 }, { SENSORS_W83781D_BEEP_ENABLE, "beep_enable", SENSORS_W83781D_ALARMS, @@ -855,7 +855,7 @@ static sensors_chip_feature w83781d_features[] = W83781D_SYSCTL_BEEP, VALUE(1), 0 }, { SENSORS_W83781D_BEEPS, "beeps", SENSORS_W83781D_ALARMS, SENSORS_W83781D_ALARMS, RW, - W83781D_SYSCTL_BEEP, VALUE(2), 0, "beep_mask" }, + W83781D_SYSCTL_BEEP, VALUE(2), 0 }, { 0 } };