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

Commit 0c9af9f6 authored Mar 08, 2018 by Subbaraman Narayanamurthy

power_supply: Move battery_type under string properties



Currently, battery_type is treated as an integer property as it
is not in the group of string properties. Move it to the right
place after model_name from where string properties start.

Change-Id: Ib97663ed9b3b5c3f6b3ef4fe49a1e2d1d536ebc6
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>

parent 285dbc85

drivers/power/supply/power_supply_sysfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -360,7 +360,6 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(pd_voltage_min),
		POWER_SUPPLY_ATTR(sdp_current_max),
		POWER_SUPPLY_ATTR(connector_type),
		POWER_SUPPLY_ATTR(battery_type),
		POWER_SUPPLY_ATTR(parallel_batfet_mode),
		POWER_SUPPLY_ATTR(parallel_fcc_max),
		POWER_SUPPLY_ATTR(min_icl),
		@@ -374,6 +373,7 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(model_name),
		POWER_SUPPLY_ATTR(manufacturer),
		POWER_SUPPLY_ATTR(serial_number),
		POWER_SUPPLY_ATTR(battery_type),
		};

		static struct attribute *

include/linux/power_supply.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,6 @@ enum power_supply_property {
		POWER_SUPPLY_PROP_PD_VOLTAGE_MIN,
		POWER_SUPPLY_PROP_SDP_CURRENT_MAX,
		POWER_SUPPLY_PROP_CONNECTOR_TYPE,
		POWER_SUPPLY_PROP_BATTERY_TYPE,
		POWER_SUPPLY_PROP_PARALLEL_BATFET_MODE,
		POWER_SUPPLY_PROP_PARALLEL_FCC_MAX,
		POWER_SUPPLY_PROP_MIN_ICL,
		@@ -287,6 +286,7 @@ enum power_supply_property {
		POWER_SUPPLY_PROP_MODEL_NAME,
		POWER_SUPPLY_PROP_MANUFACTURER,
		POWER_SUPPLY_PROP_SERIAL_NUMBER,
		POWER_SUPPLY_PROP_BATTERY_TYPE,
		};

		enum power_supply_type {