Commit 8efe4440 authored by Andres Salomon's avatar Andres Salomon Committed by Anton Vorontsov
Browse files

power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL 



The CAPACITY_LEVEL stuff defines various levels of charge; however, what
is the difference between them?  What differentiates between HIGH and NORMAL,
LOW and CRITICAL, etc?

As it appears that these are fairly arbitrary, we end up making such policy
decisions in the kernel (or in hardware).  This is the sort of decision that
should be made in userspace, not in the kernel.

If the hardware does not support _CAPACITY and it cannot be easily calculated,
then perhaps the driver should register a custom CAPACITY_LEVEL attribute;
however, userspace should not become accustomed to looking for such a thing,
and we should certainly not encourage drivers to provide CAPACITY_LEVEL
stubs.

The following removes support for POWER_SUPPLY_PROP_CAPACITY_LEVEL.  The
OLPC battery driver is the only driver making use of this, so it's
removed from there as well.

Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 4d24473c

Documentation/power_supply_class.txt

+0 −2
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ age)". I.e. these attributes represents real thresholds, not design values. 
ENERGY_FULL, ENERGY_EMPTY - same as above but for energy.



CAPACITY - capacity in percents.

CAPACITY_LEVEL - capacity level. This corresponds to

POWER_SUPPLY_CAPACITY_LEVEL_*.



TEMP - temperature of the power supply.

TEMP_AMBIENT - ambient temperature.

drivers/power/olpc_battery.c

+0 −9
Original line number Diff line number Diff line
@@ -226,14 +226,6 @@ static int olpc_bat_get_property(struct power_supply *psy, 
			return ret;

		val->intval = ec_byte;

		break;

	case POWER_SUPPLY_PROP_CAPACITY_LEVEL:

		if (ec_byte & BAT_STAT_FULL)

			val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL;

		else if (ec_byte & BAT_STAT_LOW)

			val->intval = POWER_SUPPLY_CAPACITY_LEVEL_LOW;

		else

			val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;

		break;

	case POWER_SUPPLY_PROP_TEMP:

		ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2);

		if (ret)
@@ -265,7 +257,6 @@ static enum power_supply_property olpc_bat_props[] = { 
	POWER_SUPPLY_PROP_VOLTAGE_AVG,

	POWER_SUPPLY_PROP_CURRENT_AVG,

	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_CAPACITY_LEVEL,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_TEMP_AMBIENT,

	POWER_SUPPLY_PROP_MANUFACTURER,

drivers/power/power_supply_sysfs.c

+0 −6
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ static ssize_t power_supply_show_property(struct device *dev, 
	static char *technology_text[] = {

		"Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd"

	};

	static char *capacity_level_text[] = {

		"Unknown", "Critical", "Low", "Normal", "High", "Full"

	};

	ssize_t ret;

	struct power_supply *psy = dev_get_drvdata(dev);

	const ptrdiff_t off = attr - power_supply_attrs;
@@ -73,9 +70,6 @@ static ssize_t power_supply_show_property(struct device *dev, 
		return sprintf(buf, "%s\n", health_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_TECHNOLOGY)

		return sprintf(buf, "%s\n", technology_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_CAPACITY_LEVEL)

		return sprintf(buf, "%s\n",

			       capacity_level_text[value.intval]);

	else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)

		return sprintf(buf, "%s\n", value.strval);

include/linux/power_supply.h

+0 −10
Original line number Diff line number Diff line
@@ -56,15 +56,6 @@ enum { 
	POWER_SUPPLY_TECHNOLOGY_NiCd,

};



enum {

	POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN = 0,

	POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL,

	POWER_SUPPLY_CAPACITY_LEVEL_LOW,

	POWER_SUPPLY_CAPACITY_LEVEL_NORMAL,

	POWER_SUPPLY_CAPACITY_LEVEL_HIGH,

	POWER_SUPPLY_CAPACITY_LEVEL_FULL,

};



enum power_supply_property {

	/* Properties of type `int' */

	POWER_SUPPLY_PROP_STATUS = 0,
@@ -91,7 +82,6 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_ENERGY_NOW,

	POWER_SUPPLY_PROP_ENERGY_AVG,

	POWER_SUPPLY_PROP_CAPACITY, /* in percents! */

	POWER_SUPPLY_PROP_CAPACITY_LEVEL,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_TEMP_AMBIENT,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,

CRA Git | Maintained and supported by SUSTech CRA and CCSE