[v3,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

[v3,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

[Amy.Shih]

From: "amy.shih" <amy.shih@advantech.com.tw>

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@advantech.com.tw>
---
Changes in v3:
- Simplified the bit map.
- Modified the if statement.
Changes in v2:
- Moved the if statement to outside.

 drivers/hwmon/nct7904.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 95b447cfa24c..f62dd1882451 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -915,12 +915,15 @@ static int nct7904_probe(struct i2c_client *client,
 
 	data->temp_mode = 0;
 	for (i = 0; i < 4; i++) {
-		val = (ret & (0x03 << i)) >> (i * 2);
+		val = (ret >> (i * 2)) & 0x03;
 		bit = (1 << i);
-		if (val == 0)
+		if (val == 0) {
 			data->tcpu_mask &= ~bit;
-		else if (val == 0x1 || val == 0x2)
-			data->temp_mode |= bit;
+		} else {
+			if (val == 0x1 || val == 0x2)
+				data->temp_mode |= bit;
+			data->vsen_mask &= ~(0x06 << (i * 2));
+		}
 	}
 
 	/* PECI */
-- 
2.17.1

Re: [v3,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct.

[Guenter Roeck]

On Wed, Sep 18, 2019 at 04:48:00PM +0800, Amy.Shih@advantech.com.tw wrote:
> From: "amy.shih" <amy.shih@advantech.com.tw>
> 
> 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@advantech.com.tw>

Applied.

Thanks,
Guenter

> ---
> Changes in v3:
> - Simplified the bit map.
> - Modified the if statement.
> Changes in v2:
> - Moved the if statement to outside.
> 
>  drivers/hwmon/nct7904.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
> index 95b447cfa24c..f62dd1882451 100644
> --- a/drivers/hwmon/nct7904.c
> +++ b/drivers/hwmon/nct7904.c
> @@ -915,12 +915,15 @@ static int nct7904_probe(struct i2c_client *client,
>  
>  	data->temp_mode = 0;
>  	for (i = 0; i < 4; i++) {
> -		val = (ret & (0x03 << i)) >> (i * 2);
> +		val = (ret >> (i * 2)) & 0x03;
>  		bit = (1 << i);
> -		if (val == 0)
> +		if (val == 0) {
>  			data->tcpu_mask &= ~bit;
> -		else if (val == 0x1 || val == 0x2)
> -			data->temp_mode |= bit;
> +		} else {
> +			if (val == 0x1 || val == 0x2)
> +				data->temp_mode |= bit;
> +			data->vsen_mask &= ~(0x06 << (i * 2));
> +		}
>  	}
>  
>  	/* PECI */