The patch titled
power_supply: fix up CHARGE_COUNTER output to be more precise
has been removed from the -mm tree. Its filename was
power_supply-add-charge_counter-property-and-olpc_battery-support-for-it-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: power_supply: fix up CHARGE_COUNTER output to be more precise
From: Andres Salomon <dilinger@xxxxxxxxxx>
As Richard Smith pointed out, ACR * 6250 / 15 provides for less
precision loss than ACR * 4167 / 10, _and_ it doesn't overflow. Switch
to using that equation for CHARGE_COUNTER.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Cc: "Richard A. Smith" <richard@xxxxxxxxxx>
Cc: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/power/olpc_battery.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/power/olpc_battery.c~power_supply-add-charge_counter-property-and-olpc_battery-support-for-it-fix drivers/power/olpc_battery.c
--- a/drivers/power/olpc_battery.c~power_supply-add-charge_counter-property-and-olpc_battery-support-for-it-fix
+++ a/drivers/power/olpc_battery.c
@@ -19,7 +19,7 @@
#define EC_BAT_VOLTAGE 0x10 /* uint16_t, *9.76/32, mV */
#define EC_BAT_CURRENT 0x11 /* int16_t, *15.625/120, mA */
-#define EC_BAT_ACR 0x12 /* int16_t, *416.7, µAh */
+#define EC_BAT_ACR 0x12 /* int16_t, *6250/15, µAh */
#define EC_BAT_TEMP 0x13 /* uint16_t, *100/256, °C */
#define EC_AMB_TEMP 0x14 /* uint16_t, *100/256, °C */
#define EC_BAT_STATUS 0x15 /* uint8_t, bitmask */
@@ -295,7 +295,7 @@ static int olpc_bat_get_property(struct
return ret;
ec_word = be16_to_cpu(ec_word);
- val->intval = ec_word * 4167 / 10;
+ val->intval = ec_word * 6250 / 15;
break;
case POWER_SUPPLY_PROP_SERIAL_NUMBER:
ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8);
_
Patches currently in -mm which might be from dilinger@xxxxxxxxxx are
git-input.patch
git-battery.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
