Commit 35092c58 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel

power: supply: bq27xxx: Add cache parameter to bq27xxx_battery_current_and_status()

Add a cache parameter to bq27xxx_battery_current_and_status() so that
it can optionally use cached flags instead of re-reading them itself.

This is a preparation patch for making bq27xxx_battery_update() check
the status and have it call power_supply_changed() on status changes.

Fixes: 297a533b ("bq27x00: Cache battery registers")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent c00bc804
...@@ -1840,7 +1840,8 @@ static bool bq27xxx_battery_is_full(struct bq27xxx_device_info *di, int flags) ...@@ -1840,7 +1840,8 @@ static bool bq27xxx_battery_is_full(struct bq27xxx_device_info *di, int flags)
static int bq27xxx_battery_current_and_status( static int bq27xxx_battery_current_and_status(
struct bq27xxx_device_info *di, struct bq27xxx_device_info *di,
union power_supply_propval *val_curr, union power_supply_propval *val_curr,
union power_supply_propval *val_status) union power_supply_propval *val_status,
struct bq27xxx_reg_cache *cache)
{ {
bool single_flags = (di->opts & BQ27XXX_O_ZERO); bool single_flags = (di->opts & BQ27XXX_O_ZERO);
int curr; int curr;
...@@ -1852,11 +1853,15 @@ static int bq27xxx_battery_current_and_status( ...@@ -1852,11 +1853,15 @@ static int bq27xxx_battery_current_and_status(
return curr; return curr;
} }
if (cache) {
flags = cache->flags;
} else {
flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, single_flags); flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, single_flags);
if (flags < 0) { if (flags < 0) {
dev_err(di->dev, "error reading flags\n"); dev_err(di->dev, "error reading flags\n");
return flags; return flags;
} }
}
if (di->opts & BQ27XXX_O_ZERO) { if (di->opts & BQ27XXX_O_ZERO) {
if (!(flags & BQ27000_FLAG_CHGS)) { if (!(flags & BQ27000_FLAG_CHGS)) {
...@@ -2001,7 +2006,7 @@ static int bq27xxx_battery_get_property(struct power_supply *psy, ...@@ -2001,7 +2006,7 @@ static int bq27xxx_battery_get_property(struct power_supply *psy,
switch (psp) { switch (psp) {
case POWER_SUPPLY_PROP_STATUS: case POWER_SUPPLY_PROP_STATUS:
ret = bq27xxx_battery_current_and_status(di, NULL, val); ret = bq27xxx_battery_current_and_status(di, NULL, val, NULL);
break; break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW: case POWER_SUPPLY_PROP_VOLTAGE_NOW:
ret = bq27xxx_battery_voltage(di, val); ret = bq27xxx_battery_voltage(di, val);
...@@ -2010,7 +2015,7 @@ static int bq27xxx_battery_get_property(struct power_supply *psy, ...@@ -2010,7 +2015,7 @@ static int bq27xxx_battery_get_property(struct power_supply *psy,
val->intval = di->cache.flags < 0 ? 0 : 1; val->intval = di->cache.flags < 0 ? 0 : 1;
break; break;
case POWER_SUPPLY_PROP_CURRENT_NOW: case POWER_SUPPLY_PROP_CURRENT_NOW:
ret = bq27xxx_battery_current_and_status(di, val, NULL); ret = bq27xxx_battery_current_and_status(di, val, NULL, NULL);
break; break;
case POWER_SUPPLY_PROP_CAPACITY: case POWER_SUPPLY_PROP_CAPACITY:
ret = bq27xxx_simple_value(di->cache.capacity, val); ret = bq27xxx_simple_value(di->cache.capacity, val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment