iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power: supply: ab8500_fg: silence uninitialized variable warnings

Browse Source 
[ Upstream commit 54baff8d4e5dce2cef61953b1dc22079cda1ddb1 ]

If kstrtoul() fails then we print "charge_full" when it's uninitialized.
The debug printk doesn't add anything so I deleted it and cleaned these
two functions up a bit.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dan Carpenter 2018-09-10 11:39:04 +03:00 committed by Greg Kroah-Hartman
parent 1f6a7105b1
commit 52741990fa
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/power/ab8500_fg.c
View File

@ -2447,17 +2447,14 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf,
size_t count)
{
unsigned long charge_full;
ssize_t ret;
int ret;
ret = kstrtoul(buf, 10, &charge_full);
if (ret)
return ret;
dev_dbg(di->dev, "Ret %zd charge_full %lu", ret, charge_full);
if (!ret) {
di->bat_cap.max_mah = (int) charge_full;
ret = count;
}
return ret;
di->bat_cap.max_mah = (int) charge_full;
return count;
}
static ssize_t charge_now_show(struct ab8500_fg *di, char *buf)
@ -2469,20 +2466,16 @@ static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf,
size_t count)
{
unsigned long charge_now;
ssize_t ret;
int ret;
ret = kstrtoul(buf, 10, &charge_now);
if (ret)
return ret;
dev_dbg(di->dev, "Ret %zd charge_now %lu was %d",
ret, charge_now, di->bat_cap.prev_mah);
if (!ret) {
di->bat_cap.user_mah = (int) charge_now;
di->flags.user_cap = true;
ret = count;
queue_delayed_work(di->fg_wq, &di->fg_periodic_work, 0);
}
return ret;
di->bat_cap.user_mah = (int) charge_now;
di->flags.user_cap = true;
queue_delayed_work(di->fg_wq, &di->fg_periodic_work, 0);
return count;
}
static struct ab8500_fg_sysfs_entry charge_full_attr =