Skip to contentSkip to conversation

hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

PATCH Superseded [email protected] 2 participants 2 messages Sep 16, 2019 Hardware monitoring

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

From: "amy.shih" <[email protected]>

Voltage sensors overlap with external temperature sensors. Detect the multi-function of voltage, thermal diode and thermistor from register VT_ADC_MD_REG to set value of vsen_mask in nct7904_data struct.

---
 drivers/hwmon/nct7904.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hwmon/nct7904.c +4 -1
index 95b447cfa24c..ad61c3d92411 100644
@@ -919,8 +919,11 @@ static int nct7904_probe(struct i2c_client *client,
 		bit = (1 << i);
 		if (val == 0)
 			data->tcpu_mask &= ~bit;
-		else if (val == 0x1 || val == 0x2)
+		else if (val == 0x1 || val == 0x2) {
 			data->temp_mode |= bit;
+			data->vsen_mask &= ~(0x06 << (i * 2));
+		} else
+			data->vsen_mask &= ~(0x06 << (i * 2));
 	}
 
 	/* PECI */
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 17 lines · On 9/15/19 7:18 PM, [email protected] wrote:

From: "amy.shih" <[email protected]>

Voltage sensors overlap with external temperature sensors. Detect the multi-function of voltage, thermal diode and thermistor from register VT_ADC_MD_REG to set value of vsen_mask in nct7904_data struct.

---
  drivers/hwmon/nct7904.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hwmon/nct7904.c +0 -0
index 95b447cfa24c..ad61c3d92411 100644

drivers/hwmon/nct7904.c static int nct7904_probe(struct i2c_client *client, · line 926

Quoted 9 lines
drivers/hwmon/nct7904.c +4 -1
@@ -919,8 +919,11 @@ static int nct7904_probe(struct i2c_client *client,
  		bit = (1 << i);
  		if (val == 0)
  			data->tcpu_mask &= ~bit;
-		else if (val == 0x1 || val == 0x2)
+		else if (val == 0x1 || val == 0x2) {
  			data->temp_mode |= bit;
+			data->vsen_mask &= ~(0x06 << (i * 2));
+		} else
+			data->vsen_mask &= ~(0x06 << (i * 2));

The second instruction is the same for both branches of the if() statement and can thus be moved outside.

Either case, if {} is needed for one branch of an if statement, it needs to be used for the other branch(es) as well.

Guenter