On 9/15/19 7:18 PM, Amy.Shih@xxxxxxxxxxxxxxxx wrote:
From: "amy.shih" <amy.shih@xxxxxxxxxxxxxxxx>
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.
Signed-off-by: amy.shih <amy.shih@xxxxxxxxxxxxxxxx>
---
drivers/hwmon/nct7904.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 95b447cfa24c..ad61c3d92411 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -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
