|
@@ -2433,17 +2433,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)
|
|
@@ -2455,20 +2452,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 =
|