ds2782_battery: Fix units
authorRyan Mallon <ryan@bluewatersys.com>
Fri, 1 Oct 2010 21:17:42 +0000 (14:17 -0700)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Wed, 6 Oct 2010 13:36:49 +0000 (17:36 +0400)
Correct the unit names in the ds2782 battery driver. Changes voltage_uA
to voltage_uV and capacity_uA to capacity.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Yulia Vilensky <vilensky@compulab.co.il>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
drivers/power/ds2782_battery.c

index 84d3c43cf2bc83f92ea05c1a381d113f4f7b6375..6957e8af64490d006d383b7ce253bd7faddca0f4 100644 (file)
@@ -44,8 +44,8 @@ struct ds278x_info;
 
 struct ds278x_battery_ops {
        int (*get_battery_current)(struct ds278x_info *info, int *current_uA);
-       int (*get_battery_voltage)(struct ds278x_info *info, int *voltage_uA);
-       int (*get_battery_capacity)(struct ds278x_info *info, int *capacity_uA);
+       int (*get_battery_voltage)(struct ds278x_info *info, int *voltage_uV);
+       int (*get_battery_capacity)(struct ds278x_info *info, int *capacity);
 };
 
 #define to_ds278x_info(x) container_of(x, struct ds278x_info, battery)
@@ -137,7 +137,7 @@ static int ds2782_get_current(struct ds278x_info *info, int *current_uA)
        return 0;
 }
 
-static int ds2782_get_voltage(struct ds278x_info *info, int *voltage_uA)
+static int ds2782_get_voltage(struct ds278x_info *info, int *voltage_uV)
 {
        s16 raw;
        int err;
@@ -149,7 +149,7 @@ static int ds2782_get_voltage(struct ds278x_info *info, int *voltage_uA)
        err = ds278x_read_reg16(info, DS278x_REG_VOLT_MSB, &raw);
        if (err)
                return err;
-       *voltage_uA = (raw / 32) * 4800;
+       *voltage_uV = (raw / 32) * 4800;
        return 0;
 }
 
@@ -177,7 +177,7 @@ static int ds2786_get_current(struct ds278x_info *info, int *current_uA)
        return 0;
 }
 
-static int ds2786_get_voltage(struct ds278x_info *info, int *voltage_uA)
+static int ds2786_get_voltage(struct ds278x_info *info, int *voltage_uV)
 {
        s16 raw;
        int err;
@@ -189,7 +189,7 @@ static int ds2786_get_voltage(struct ds278x_info *info, int *voltage_uA)
        err = ds278x_read_reg16(info, DS278x_REG_VOLT_MSB, &raw);
        if (err)
                return err;
-       *voltage_uA = (raw / 8) * 1220;
+       *voltage_uV = (raw / 8) * 1220;
        return 0;
 }