mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-21 08:19:28 +00:00
Code Issues Releases Wiki Activity

power: supply: cpcap-battery: Simplify short term power average calculation

Browse source 
We can use sign_extend32() here to simplify things. And let's fix the
comment for CCM register, that contains the calibration offset.

Cc: Merlijn Wajer <merlijn@wizzup.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Tony Lindgren 2019-10-09 14:06:19 -07:00 committed by Sebastian Reichel
parent c59b3bad6f
commit ac437c1c84
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/power/supply/cpcap-battery.c
View file

@ -312,31 +312,28 @@ cpcap_battery_read_accumulated(struct cpcap_battery_ddata *ddata,
static int cpcap_battery_cc_get_avg_current(struct cpcap_battery_ddata *ddata) static int cpcap_battery_cc_get_avg_current(struct cpcap_battery_ddata *ddata)
{ {
int value, acc, error; int value, acc, error;
s32 sample = 1; s32 sample;
s16 offset; s16 offset;
if (ddata->vendor == CPCAP_VENDOR_ST)
sample = 4;
/* Coulomb counter integrator */ /* Coulomb counter integrator */
error = regmap_read(ddata->reg, CPCAP_REG_CCI, &value); error = regmap_read(ddata->reg, CPCAP_REG_CCI, &value);
if (error) if (error)
return error; return error;
if ((ddata->vendor == CPCAP_VENDOR_TI) && (value > 0x2000)) if (ddata->vendor == CPCAP_VENDOR_TI) {
value = value | 0xc000; acc = sign_extend32(value, 13);
sample = 1;
} else {
acc = (s16)value;
sample = 4;
}
acc = (s16)value; /* Coulomb counter calibration offset */
/* Coulomb counter sample time */
error = regmap_read(ddata->reg, CPCAP_REG_CCM, &value); error = regmap_read(ddata->reg, CPCAP_REG_CCM, &value);
if (error) if (error)
return error; return error;
if (value < 0x200) offset = sign_extend32(value, 9);
offset = value;
else
offset = value | 0xfc00;
return cpcap_battery_cc_to_ua(ddata, sample, acc, offset); return cpcap_battery_cc_to_ua(ddata, sample, acc, offset);
} }