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

Commit 88030808 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'battery' into release

parents e000f8f7 a1b4bd69

drivers/acpi/battery.c

+27 −8
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static int acpi_battery_get_property(struct power_supply *psy, 
				     enum power_supply_property psp,

				     union power_supply_propval *val)

{

	int ret = 0;

	struct acpi_battery *battery = to_acpi_battery(psy);



	if (acpi_battery_present(battery)) {
@@ -209,25 +210,43 @@ static int acpi_battery_get_property(struct power_supply *psy, 
		val->intval = battery->cycle_count;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:

		if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)

			ret = -ENODEV;

		else

			val->intval = battery->design_voltage * 1000;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)

			ret = -ENODEV;

		else

			val->intval = battery->voltage_now * 1000;

		break;

	case POWER_SUPPLY_PROP_CURRENT_NOW:

	case POWER_SUPPLY_PROP_POWER_NOW:

		if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)

			ret = -ENODEV;

		else

			val->intval = battery->rate_now * 1000;

		break;

	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:

	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:

		if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)

			ret = -ENODEV;

		else

			val->intval = battery->design_capacity * 1000;

		break;

	case POWER_SUPPLY_PROP_CHARGE_FULL:

	case POWER_SUPPLY_PROP_ENERGY_FULL:

		if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN)

			ret = -ENODEV;

		else

			val->intval = battery->full_charge_capacity * 1000;

		break;

	case POWER_SUPPLY_PROP_CHARGE_NOW:

	case POWER_SUPPLY_PROP_ENERGY_NOW:

		if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)

			ret = -ENODEV;

		else

			val->intval = battery->capacity_now * 1000;

		break;

	case POWER_SUPPLY_PROP_MODEL_NAME:
@@ -240,9 +259,9 @@ static int acpi_battery_get_property(struct power_supply *psy, 
		val->strval = battery->serial_number;

		break;

	default:

		return -EINVAL;

		ret = -EINVAL;

	}

	return 0;

	return ret;

}



static enum power_supply_property charge_battery_props[] = {