hwmon: (it87) Create voltage attributes only if voltage is enabled

On IT8782F and IT8783F, some voltage input pins may be disabled. Don't create
sysfs attribute files if that is the case.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>

1 files changed, 124 insertions, 38 deletions

diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index aebac1334ff6..bef8732f08b1 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -234,6 +234,7 @@ struct it87_sio_data {
         u8 beep_pin;
         u8 internal;    /* Internal sensors can be labeled */
         /* Features skipped based on config or DMI */
+        u16 skip_in;
         u8 skip_vid;
         u8 skip_fan;
         u8 skip_pwm;
@@ -1371,41 +1372,73 @@ static ssize_t show_name(struct device *dev, struct device_attribute
 }
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static struct attribute *it87_attributes[] = {
+static struct attribute *it87_attributes_in[9][5] = {
+{
         &sensor_dev_attr_in0_input.dev_attr.attr,
-        &sensor_dev_attr_in1_input.dev_attr.attr,
-        &sensor_dev_attr_in2_input.dev_attr.attr,
-        &sensor_dev_attr_in3_input.dev_attr.attr,
-        &sensor_dev_attr_in4_input.dev_attr.attr,
-        &sensor_dev_attr_in5_input.dev_attr.attr,
-        &sensor_dev_attr_in6_input.dev_attr.attr,
-        &sensor_dev_attr_in7_input.dev_attr.attr,
-        &sensor_dev_attr_in8_input.dev_attr.attr,
         &sensor_dev_attr_in0_min.dev_attr.attr,
-        &sensor_dev_attr_in1_min.dev_attr.attr,
-        &sensor_dev_attr_in2_min.dev_attr.attr,
-        &sensor_dev_attr_in3_min.dev_attr.attr,
-        &sensor_dev_attr_in4_min.dev_attr.attr,
-        &sensor_dev_attr_in5_min.dev_attr.attr,
-        &sensor_dev_attr_in6_min.dev_attr.attr,
-        &sensor_dev_attr_in7_min.dev_attr.attr,
         &sensor_dev_attr_in0_max.dev_attr.attr,
-        &sensor_dev_attr_in1_max.dev_attr.attr,
-        &sensor_dev_attr_in2_max.dev_attr.attr,
-        &sensor_dev_attr_in3_max.dev_attr.attr,
-        &sensor_dev_attr_in4_max.dev_attr.attr,
-        &sensor_dev_attr_in5_max.dev_attr.attr,
-        &sensor_dev_attr_in6_max.dev_attr.attr,
-        &sensor_dev_attr_in7_max.dev_attr.attr,
         &sensor_dev_attr_in0_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in1_min.dev_attr.attr,
+        &sensor_dev_attr_in1_max.dev_attr.attr,
         &sensor_dev_attr_in1_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in2_min.dev_attr.attr,
+        &sensor_dev_attr_in2_max.dev_attr.attr,
         &sensor_dev_attr_in2_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in3_input.dev_attr.attr,
+        &sensor_dev_attr_in3_min.dev_attr.attr,
+        &sensor_dev_attr_in3_max.dev_attr.attr,
         &sensor_dev_attr_in3_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in4_input.dev_attr.attr,
+        &sensor_dev_attr_in4_min.dev_attr.attr,
+        &sensor_dev_attr_in4_max.dev_attr.attr,
         &sensor_dev_attr_in4_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in5_input.dev_attr.attr,
+        &sensor_dev_attr_in5_min.dev_attr.attr,
+        &sensor_dev_attr_in5_max.dev_attr.attr,
         &sensor_dev_attr_in5_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in6_input.dev_attr.attr,
+        &sensor_dev_attr_in6_min.dev_attr.attr,
+        &sensor_dev_attr_in6_max.dev_attr.attr,
         &sensor_dev_attr_in6_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in7_input.dev_attr.attr,
+        &sensor_dev_attr_in7_min.dev_attr.attr,
+        &sensor_dev_attr_in7_max.dev_attr.attr,
         &sensor_dev_attr_in7_alarm.dev_attr.attr,
+        NULL
+}, {
+        &sensor_dev_attr_in8_input.dev_attr.attr,
+        NULL
+} };
+
+static const struct attribute_group it87_group_in[9] = {
+        { .attrs = it87_attributes_in[0] },
+        { .attrs = it87_attributes_in[1] },
+        { .attrs = it87_attributes_in[2] },
+        { .attrs = it87_attributes_in[3] },
+        { .attrs = it87_attributes_in[4] },
+        { .attrs = it87_attributes_in[5] },
+        { .attrs = it87_attributes_in[6] },
+        { .attrs = it87_attributes_in[7] },
+        { .attrs = it87_attributes_in[8] },
+};
 
+static struct attribute *it87_attributes[] = {
         &sensor_dev_attr_temp1_input.dev_attr.attr,
         &sensor_dev_attr_temp2_input.dev_attr.attr,
         &sensor_dev_attr_temp3_input.dev_attr.attr,
@@ -1432,7 +1465,7 @@ static const struct attribute_group it87_group = {
         .attrs = it87_attributes,
 };
 
-static struct attribute *it87_attributes_beep[] = {
+static struct attribute *it87_attributes_in_beep[] = {
         &sensor_dev_attr_in0_beep.dev_attr.attr,
         &sensor_dev_attr_in1_beep.dev_attr.attr,
         &sensor_dev_attr_in2_beep.dev_attr.attr,
@@ -1441,7 +1474,10 @@ static struct attribute *it87_attributes_beep[] = {
         &sensor_dev_attr_in5_beep.dev_attr.attr,
         &sensor_dev_attr_in6_beep.dev_attr.attr,
         &sensor_dev_attr_in7_beep.dev_attr.attr,
+        NULL
+};
 
+static struct attribute *it87_attributes_beep[] = {
         &sensor_dev_attr_temp1_beep.dev_attr.attr,
         &sensor_dev_attr_temp2_beep.dev_attr.attr,
         &sensor_dev_attr_temp3_beep.dev_attr.attr,
@@ -1696,7 +1732,6 @@ static int __init it87_find(unsigned short *address,
                 sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
         } else if (sio_data->type == it8783) {
                 int reg25, reg27, reg2A, reg2C, regEF;
-                bool uart6;
 
                 sio_data->skip_vid = 1; /* No VID */
 
@@ -1708,10 +1743,8 @@ static int __init it87_find(unsigned short *address,
                 reg2C = superio_inb(IT87_SIO_PINX2_REG);
                 regEF = superio_inb(IT87_SIO_SPI_REG);
 
-                uart6 = reg2C & (1 << 2);
-
                 /* Check if fan3 is there or not */
-                if ((reg27 & (1 << 0)) || !uart6)
+                if ((reg27 & (1 << 0)) || !(reg2C & (1 << 2)))
                         sio_data->skip_fan |= (1 << 2);
                 if ((reg25 & (1 << 4))
                     || (!(reg2A & (1 << 1)) && (regEF & (1 << 0))))
@@ -1724,19 +1757,39 @@ static int __init it87_find(unsigned short *address,
                         sio_data->skip_pwm |= (1 << 1);
 
                 /* VIN5 */
-                if ((reg27 & (1 << 0)) || uart6)
-                        ; /* No VIN5 */
+                if ((reg27 & (1 << 0)) || (reg2C & (1 << 2)))
+                        sio_data->skip_in |= (1 << 5); /* No VIN5 */
 
                 /* VIN6 */
-                if ((reg27 & (1 << 1)) || uart6)
-                        ; /* No VIN6 */
+                if (reg27 & (1 << 1))
+                        sio_data->skip_in |= (1 << 6); /* No VIN6 */
 
                 /*
                  * VIN7
                  * Does not depend on bit 2 of Reg2C, contrary to datasheet.
                  */
-                if (reg27 & (1 << 2))
+                if (reg27 & (1 << 2)) {