Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 353f867b authored by Ryan Mallon's avatar Ryan Mallon Committed by Anton Vorontsov
Browse files

ds2782_battery: Fix units 



Correct the unit names in the ds2782 battery driver. Changes voltage_uA
to voltage_uV and capacity_uA to capacity.

Signed-off-by: default avatarRyan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent 2e727f17

drivers/power/ds2782_battery.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

}