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

Commit 37c580a4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power_supply: Add local extensions of string property names properly"

parents d470132e ee0f7c41

drivers/power/supply/power_supply_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -465,9 +465,9 @@ static struct device_attribute power_supply_attrs[] = { 
	/* Properties of type `const char *' */

	POWER_SUPPLY_ATTR(model_name),

	POWER_SUPPLY_ATTR(manufacturer),

	POWER_SUPPLY_ATTR(serial_number),

	POWER_SUPPLY_ATTR(battery_type),

	POWER_SUPPLY_ATTR(cycle_counts),

	POWER_SUPPLY_ATTR(serial_number),

};



static struct attribute *

include/linux/power_supply.h

+5 −1
Original line number Diff line number Diff line
@@ -338,9 +338,13 @@ enum power_supply_property { 
	/* Properties of type `const char *' */

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_SERIAL_NUMBER,

	POWER_SUPPLY_PROP_BATTERY_TYPE,

	POWER_SUPPLY_PROP_CYCLE_COUNTS,

	/*

	 * Add local extensions for properties with string values between

	 * MODEL_NAME and SERIAL_NUMBER. Don't add below SERIAL_NUMBER.

	 */

	POWER_SUPPLY_PROP_SERIAL_NUMBER,

};



enum power_supply_type {