Revert "ACPI: battery: Convert discharge energy rate to current properly"

[linux-2.6-omap-h63xx.git] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 4fb3c12ac1d89394765b3f16e97cf82a14083134..1423b0c0cd2eecc6e3c7b2f5c78746cee5fac4eb 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -173,19 +173,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
                val->intval = battery->voltage_now * 1000;
                break;
        case POWER_SUPPLY_PROP_CURRENT_NOW:
-               val->intval = battery->current_now;
-               if (battery->power_unit) {
-                       val->intval *= 1000;
-               } else {
-                       /*
-                        * If power units are mW, convert to mA by dividing by
-                        * current voltage.
-                        */
-                       if (battery->voltage_now)
-                               val->intval /= battery->voltage_now;
-                       else
-                               val->intval = -1;
-               }
+               val->intval = battery->current_now * 1000;
                break;
        case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
        case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: