2023-04-01 11:55:52

by Tom Rix

[permalink] [raw]

Subject: [PATCH] power: supply: twl4030-charger: remove unused cur_reg variable

---

clang with W=1 reports
drivers/power/supply/twl4030_charger.c:242:16: error: variable
'cur_reg' set but not used [-Werror,-Wunused-but-set-variable]
unsigned reg, cur_reg;
^
This variable is not used so remove it.

Signed-off-by: Tom Rix <[email protected]>
---
drivers/power/supply/twl4030_charger.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 7adfd69fe649..5fa5b2311330 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -239,7 +239,7 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
{
int status;
int cur;
- unsigned reg, cur_reg;
+ unsigned reg;
u8 bcictl1, oldreg, fullreg;
bool cgain = false;
u8 boot_bci;
@@ -357,11 +357,9 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
status = twl4030_bci_read(TWL4030_BCIIREF1, &oldreg);
if (status < 0)
return status;
- cur_reg = oldreg;
status = twl4030_bci_read(TWL4030_BCIIREF2, &oldreg);
if (status < 0)
return status;
- cur_reg |= oldreg << 8;
if (reg != oldreg) {
/* disable write protection for one write access for
* BCIIREF */
--
2.27.0

2023-04-01 20:31:25

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH] power: supply: twl4030-charger: remove unused cur_reg variable

---

Hi,

On Sat, Apr 01, 2023 at 07:34:32AM -0400, Tom Rix wrote:
> clang with W=1 reports
> drivers/power/supply/twl4030_charger.c:242:16: error: variable
> 'cur_reg' set but not used [-Werror,-Wunused-but-set-variable]
> unsigned reg, cur_reg;
> ^
> This variable is not used so remove it.
>
> Signed-off-by: Tom Rix <[email protected]>
> ---
> drivers/power/supply/twl4030_charger.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 7adfd69fe649..5fa5b2311330 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -239,7 +239,7 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
> {
> int status;
> int cur;
> - unsigned reg, cur_reg;
> + unsigned reg;
> u8 bcictl1, oldreg, fullreg;
> bool cgain = false;
> u8 boot_bci;
> @@ -357,11 +357,9 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
> status = twl4030_bci_read(TWL4030_BCIIREF1, &oldreg);
> if (status < 0)
> return status;
> - cur_reg = oldreg;
> status = twl4030_bci_read(TWL4030_BCIIREF2, &oldreg);
> if (status < 0)
> return status;
> - cur_reg |= oldreg << 8;
> if (reg != oldreg) {

I think the correct fix would be checking for (reg != cur_reg) here.

-- Sebastian

> /* disable write protection for one write access for
> * BCIIREF */
> --
> 2.27.0
>

---

Attachments:

(No filename) (1.50 kB)
signature.asc (849.00 B)
Download all attachments

2023-04-01 22:08:44

by Andreas Kemnade

[permalink] [raw]

Subject: Re: [PATCH] power: supply: twl4030-charger: remove unused cur_reg variable

---

On Sat, 1 Apr 2023 22:30:26 +0200
Sebastian Reichel <[email protected]> wrote:

> Hi,
>
> On Sat, Apr 01, 2023 at 07:34:32AM -0400, Tom Rix wrote:
> > clang with W=1 reports
> > drivers/power/supply/twl4030_charger.c:242:16: error: variable
> > 'cur_reg' set but not used [-Werror,-Wunused-but-set-variable]
> > unsigned reg, cur_reg;
> > ^
> > This variable is not used so remove it.
> >
> > Signed-off-by: Tom Rix <[email protected]>
> > ---
> > drivers/power/supply/twl4030_charger.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> > index 7adfd69fe649..5fa5b2311330 100644
> > --- a/drivers/power/supply/twl4030_charger.c
> > +++ b/drivers/power/supply/twl4030_charger.c
> > @@ -239,7 +239,7 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
> > {
> > int status;
> > int cur;
> > - unsigned reg, cur_reg;
> > + unsigned reg;
> > u8 bcictl1, oldreg, fullreg;
> > bool cgain = false;
> > u8 boot_bci;
> > @@ -357,11 +357,9 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
> > status = twl4030_bci_read(TWL4030_BCIIREF1, &oldreg);
> > if (status < 0)
> > return status;
> > - cur_reg = oldreg;
> > status = twl4030_bci_read(TWL4030_BCIIREF2, &oldreg);
> > if (status < 0)
> > return status;
> > - cur_reg |= oldreg << 8;
> > if (reg != oldreg) {
>
> I think the correct fix would be checking for (reg != cur_reg) here.
>
yes, makes more sense.

Regards,
Andreas