2020-10-06 17:07:57

by Colin King

[permalink] [raw]
Subject: [PATCH][next] power: supply: bq25980: remove redundant zero check on ret

From: Colin Ian King <[email protected]>

Currently ret is assigned to zero and the following statement checks
if it is non-zero. This check is redundant and can be removed

Addresses-Coverity: ("Logically dead code")
Fixes: 5069185fc18e ("power: supply: bq25980: Add support for the BQ259xx family")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/power/supply/bq25980_charger.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c
index 3995fb7cf060..f04f9acdb13b 100644
--- a/drivers/power/supply/bq25980_charger.c
+++ b/drivers/power/supply/bq25980_charger.c
@@ -613,9 +613,6 @@ static int bq25980_set_battery_property(struct power_supply *psy,
struct bq25980_device *bq = power_supply_get_drvdata(psy);
int ret = 0;

- if (ret)
- return ret;
-
switch (psp) {
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
ret = bq25980_set_const_charge_curr(bq, val->intval);
--
2.27.0


2020-10-06 17:24:43

by Dan Murphy

[permalink] [raw]
Subject: Re: [PATCH][next] power: supply: bq25980: remove redundant zero check on ret

Colin

On 10/6/20 12:06 PM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently ret is assigned to zero and the following statement checks
> if it is non-zero. This check is redundant and can be removed
>
> Addresses-Coverity: ("Logically dead code")
> Fixes: 5069185fc18e ("power: supply: bq25980: Add support for the BQ259xx family")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/power/supply/bq25980_charger.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c
> index 3995fb7cf060..f04f9acdb13b 100644
> --- a/drivers/power/supply/bq25980_charger.c
> +++ b/drivers/power/supply/bq25980_charger.c
> @@ -613,9 +613,6 @@ static int bq25980_set_battery_property(struct power_supply *psy,
> struct bq25980_device *bq = power_supply_get_drvdata(psy);
> int ret = 0;
>
> - if (ret)
> - return ret;
> -
> switch (psp) {
> case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
> ret = bq25980_set_const_charge_curr(bq, val->intval);

Thanks for the patch

Acked-by: Dan Murphy <[email protected]>

2020-10-06 17:54:32

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH][next] power: supply: bq25980: remove redundant zero check on ret

On Tue, Oct 06, 2020 at 06:06:00PM +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently ret is assigned to zero and the following statement checks
> if it is non-zero. This check is redundant and can be removed
>
> Addresses-Coverity: ("Logically dead code")
> Fixes: 5069185fc18e ("power: supply: bq25980: Add support for the BQ259xx family")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/power/supply/bq25980_charger.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c
> index 3995fb7cf060..f04f9acdb13b 100644
> --- a/drivers/power/supply/bq25980_charger.c
> +++ b/drivers/power/supply/bq25980_charger.c
> @@ -613,9 +613,6 @@ static int bq25980_set_battery_property(struct power_supply *psy,
> struct bq25980_device *bq = power_supply_get_drvdata(psy);
> int ret = 0;

I'm surprised this doesn't generate a set but not used warning. And
then at the end of the function it could be changed from "return ret;"
to "return 0;"

regards,
dan carpenter

2020-10-08 21:51:43

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH][next] power: supply: bq25980: remove redundant zero check on ret

Hi,

On Tue, Oct 06, 2020 at 12:23:06PM -0500, Dan Murphy wrote:
> Colin
>
> On 10/6/20 12:06 PM, Colin King wrote:
> > From: Colin Ian King <[email protected]>
> >
> > Currently ret is assigned to zero and the following statement checks
> > if it is non-zero. This check is redundant and can be removed
> >
> > Addresses-Coverity: ("Logically dead code")
> > Fixes: 5069185fc18e ("power: supply: bq25980: Add support for the BQ259xx family")
> > Signed-off-by: Colin Ian King <[email protected]>
> > ---
> > drivers/power/supply/bq25980_charger.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c
> > index 3995fb7cf060..f04f9acdb13b 100644
> > --- a/drivers/power/supply/bq25980_charger.c
> > +++ b/drivers/power/supply/bq25980_charger.c
> > @@ -613,9 +613,6 @@ static int bq25980_set_battery_property(struct power_supply *psy,
> > struct bq25980_device *bq = power_supply_get_drvdata(psy);
> > int ret = 0;
> > - if (ret)
> > - return ret;
> > -
> > switch (psp) {
> > case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
> > ret = bq25980_set_const_charge_curr(bq, val->intval);
>
> Thanks for the patch
>
> Acked-by: Dan Murphy <[email protected]>

Thanks, queued.

-- Sebastian

Attachments:
(No filename) (1.32 kB)
 signature.asc (849.00 B)
 Download all attachments