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

Commit a49eaec2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power_supply: remove PARALLEL_PERCENT property"

parents 5e7d3856 6802881b

drivers/power/power_supply_sysfs.c

+0 −1
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(charger_temp),

	POWER_SUPPLY_ATTR(charger_temp_max),

	POWER_SUPPLY_ATTR(parallel_disable),

	POWER_SUPPLY_ATTR(parallel_percent),

	POWER_SUPPLY_ATTR(pe_start),

	POWER_SUPPLY_ATTR(set_ship_mode),

	POWER_SUPPLY_ATTR(soc_reporting_ready),

include/linux/power_supply.h

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_CHARGER_TEMP,

	POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,

	POWER_SUPPLY_PROP_PARALLEL_DISABLE,

	POWER_SUPPLY_PROP_PARALLEL_PERCENT,

	POWER_SUPPLY_PROP_PE_START,

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	POWER_SUPPLY_PROP_SOC_REPORTING_READY,