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

Commit ae6f6187 authored by Lan Tianyu's avatar Lan Tianyu Committed by Len Brown
Browse files

ACPI / Battery: Add the power unit macro 



This patch is cosmetic only, and makes no functional change.

Signed-off-by: default avatarLan Tianyu <tianyu.lan@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8d86e5f9

drivers/acpi/battery.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -55,6 +55,9 @@ 
#define ACPI_BATTERY_NOTIFY_INFO	0x81

#define ACPI_BATTERY_NOTIFY_INFO	0x81

#define ACPI_BATTERY_NOTIFY_THRESHOLD   0x82

#define ACPI_BATTERY_NOTIFY_THRESHOLD   0x82





/* Battery power unit: 0 means mW, 1 means mA */

#define ACPI_BATTERY_POWER_UNIT_MA	1



#define _COMPONENT		ACPI_BATTERY_COMPONENT

#define _COMPONENT		ACPI_BATTERY_COMPONENT





ACPI_MODULE_NAME("battery");

ACPI_MODULE_NAME("battery");
@@ -301,7 +304,8 @@ static enum power_supply_property energy_battery_props[] = { 
#ifdef CONFIG_ACPI_PROCFS_POWER

#ifdef CONFIG_ACPI_PROCFS_POWER

inline char *acpi_battery_units(struct acpi_battery *battery)

inline char *acpi_battery_units(struct acpi_battery *battery)

{

{

	return (battery->power_unit)?"mA":"mW";

	return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ?

		"mA" : "mW";

}

}

#endif

#endif
@@ -544,7 +548,7 @@ static int sysfs_add_battery(struct acpi_battery *battery) 
{

{

	int result;

	int result;





	if (battery->power_unit) {

	if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {

		battery->bat.properties = charge_battery_props;

		battery->bat.properties = charge_battery_props;

		battery->bat.num_properties =

		battery->bat.num_properties =

			ARRAY_SIZE(charge_battery_props);

			ARRAY_SIZE(charge_battery_props);
@@ -575,7 +579,8 @@ static void sysfs_remove_battery(struct acpi_battery *battery) 




static void acpi_battery_quirks(struct acpi_battery *battery)

static void acpi_battery_quirks(struct acpi_battery *battery)

{

{

	if (dmi_name_in_vendors("Acer") && battery->power_unit) {

	if (dmi_name_in_vendors("Acer") &&

		battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {

		set_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags);

		set_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags);

	}

	}

}

}