lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: sbs: fix present rate

Browse Source 
http://bugzilla.kernel.org/show_bug.cgi?id=7897

Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Vladimir Lebedev
2007-02-10 01:51:13 -05:00
committed by Len Brown
parent eaefd5fb7d
commit e6d0f5622d
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/sbs.c
View File

@@ -1034,21 +1034,19 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
} else { } else {
seq_printf(seq, "capacity state: ok\n"); seq_printf(seq, "capacity state: ok\n");
} }
foo = (s16) battery->state.amperage * battery->info.ipscale;
if (battery->info.capacity_mode) {
foo = foo * battery->info.design_voltage / 1000;
}
if (battery->state.amperage < 0) { if (battery->state.amperage < 0) {
seq_printf(seq, "charging state: discharging\n"); seq_printf(seq, "charging state: discharging\n");
foo = battery->state.remaining_capacity * cscale * 60 / seq_printf(seq, "present rate: %d %s\n",
(battery->state.average_time_to_empty == 0 ? 1 : -foo, battery->info.capacity_mode ? "mW" : "mA");
battery->state.average_time_to_empty);
seq_printf(seq, "present rate: %i%s\n",
foo, battery->info.capacity_mode ? "0 mW" : " mA");
} else if (battery->state.amperage > 0) { } else if (battery->state.amperage > 0) {
seq_printf(seq, "charging state: charging\n"); seq_printf(seq, "charging state: charging\n");
foo = (battery->info.full_charge_capacity - seq_printf(seq, "present rate: %d %s\n",
battery->state.remaining_capacity) * cscale * 60 / foo, battery->info.capacity_mode ? "mW" : "mA");
(battery->state.average_time_to_full == 0 ? 1 :
battery->state.average_time_to_full);
seq_printf(seq, "present rate: %i%s\n",
foo, battery->info.capacity_mode ? "0 mW" : " mA");
} else { } else {
seq_printf(seq, "charging state: charged\n"); seq_printf(seq, "charging state: charged\n");
seq_printf(seq, "present rate: 0 %s\n", seq_printf(seq, "present rate: 0 %s\n",