diff mbox series

[2/2] hwmon: (adt7475) Remove some unnecessary checks

Message ID 20180814091432.xhdmxd7aqbz2si4k@kili.mountain (mailing list archive)
State Superseded
Headers show
Series [1/2] hwmon: (adt7475) Potential error pointer dereferences | expand

Commit Message

Dan Carpenter Aug. 14, 2018, 9:14 a.m. UTC 
The adt7475_read_word() returns u16 values, so it's impossible for
"ret" to be negative.  The check is harmless, but static checkers
complain about it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

IKEGAMI Tokunori Aug. 14, 2018, 9:34 a.m. UTC | #1 
Hi Dan-san,

Thank you so much for this fix also.

Reviewed-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>

By the way I will do try to change the adt7475_read_word() to return the error correctly in near future.

Regards,
Ikegami

> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Tuesday, August 14, 2018 6:15 PM
> To: Jean Delvare; IKEGAMI Tokunori
> Cc: Guenter Roeck; linux-hwmon@vger.kernel.org;
> kernel-janitors@vger.kernel.org
> Subject: [PATCH 2/2] hwmon: (adt7475) Remove some unnecessary checks
> 
> The adt7475_read_word() returns u16 values, so it's impossible for
> "ret" to be negative.  The check is harmless, but static checkers
> complain about it.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
> index 16045149f3db..9d3da8ea38ba 100644
> --- a/drivers/hwmon/adt7475.c
> +++ b/drivers/hwmon/adt7475.c
> @@ -1492,10 +1492,7 @@ static int adt7475_update_limits(struct
> i2c_client *client)
>  	for (i = 0; i < ADT7475_TACH_COUNT; i++) {
>  		if (i == 3 && !data->has_fan4)
>  			continue;
> -		ret = adt7475_read_word(client, TACH_MIN_REG(i));
> -		if (ret < 0)
> -			return ret;
> -		data->tach[MIN][i] = ret;
> +		data->tach[MIN][i] = adt7475_read_word(client,
> TACH_MIN_REG(i));
>  	}
> 
>  	for (i = 0; i < ADT7475_PWM_COUNT; i++) {
> @@ -1881,10 +1878,7 @@ static int adt7475_update_measure(struct device
> *dev)
>  	for (i = 0; i < ADT7475_TACH_COUNT; i++) {
>  		if (i == 3 && !data->has_fan4)
>  			continue;
> -		ret = adt7475_read_word(client, TACH_REG(i));
> -		if (ret < 0)
> -			return ret;
> -		data->tach[INPUT][i] = ret;
> +		data->tach[INPUT][i] = adt7475_read_word(client,
> TACH_REG(i));
>  	}
> 
>  	/* Updated by hw when in auto mode */
Dan Carpenter Aug. 14, 2018, 9:57 a.m. UTC | #2 
On Tue, Aug 14, 2018 at 09:34:30AM +0000, IKEGAMI Tokunori wrote:
> Hi Dan-san,
> 
> Thank you so much for this fix also.
> 
> Reviewed-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
> 
> By the way I will do try to change the adt7475_read_word() to return the error correctly in near future.
> 

I can do that.  Drop this patch.  I will resend.

regards,
dan carpenter
diff mbox series

Patch

diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
index 16045149f3db..9d3da8ea38ba 100644
--- a/drivers/hwmon/adt7475.c
+++ b/drivers/hwmon/adt7475.c
@@ -1492,10 +1492,7 @@  static int adt7475_update_limits(struct i2c_client *client)
 	for (i = 0; i < ADT7475_TACH_COUNT; i++) {
 		if (i == 3 && !data->has_fan4)
 			continue;
-		ret = adt7475_read_word(client, TACH_MIN_REG(i));
-		if (ret < 0)
-			return ret;
-		data->tach[MIN][i] = ret;
+		data->tach[MIN][i] = adt7475_read_word(client, TACH_MIN_REG(i));
 	}
 
 	for (i = 0; i < ADT7475_PWM_COUNT; i++) {
@@ -1881,10 +1878,7 @@  static int adt7475_update_measure(struct device *dev)
 	for (i = 0; i < ADT7475_TACH_COUNT; i++) {
 		if (i == 3 && !data->has_fan4)
 			continue;
-		ret = adt7475_read_word(client, TACH_REG(i));
-		if (ret < 0)
-			return ret;
-		data->tach[INPUT][i] = ret;
+		data->tach[INPUT][i] = adt7475_read_word(client, TACH_REG(i));
 	}
 
 	/* Updated by hw when in auto mode */