Skip to content

Commit

Permalink
ACPI / Battery: Add the power unit macro
Browse files Browse the repository at this point in the history
This patch is cosmetic only, and makes no functional change.

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Lan Tianyu authored and Len Brown committed Jul 14, 2011
1 parent 8d86e5f commit ae6f618
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/acpi/battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
#define ACPI_BATTERY_NOTIFY_INFO 0x81
#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

ACPI_MODULE_NAME("battery");
Expand Down Expand Up @@ -301,7 +304,8 @@ static enum power_supply_property energy_battery_props[] = {
#ifdef CONFIG_ACPI_PROCFS_POWER
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

Expand Down Expand Up @@ -544,7 +548,7 @@ static int sysfs_add_battery(struct acpi_battery *battery)
{
int result;

if (battery->power_unit) {
if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {
battery->bat.properties = charge_battery_props;
battery->bat.num_properties =
ARRAY_SIZE(charge_battery_props);
Expand Down Expand Up @@ -575,7 +579,8 @@ static void sysfs_remove_battery(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);
}
}
Expand Down

0 comments on commit ae6f618

Please sign in to comment.