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

Commit 6b021fc9 authored by Wenyou Yang's avatar Wenyou Yang Committed by Sebastian Reichel
Browse files

power: supply: act8945a_charger: Remove "battery_temperature" 



Remove "battery_temperature" member, it is redundant, it is the
hardware's responsibility to handle TH pin properly.
It is unnecessary to use the dt property to check if there is
a battery temperature monitor or not.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 5da643b2

drivers/power/supply/act8945a_charger.c

+3 −9
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static const char *act8945a_charger_manufacturer = "Active-semi"; 


struct act8945a_charger {

	struct regmap *regmap;

	bool battery_temperature;

};



static int act8945a_get_charger_state(struct regmap *regmap, int *val)
@@ -138,8 +137,7 @@ static int act8945a_get_charge_type(struct regmap *regmap, int *val) 
	return 0;

}



static int act8945a_get_battery_health(struct act8945a_charger *charger,

				       struct regmap *regmap, int *val)

static int act8945a_get_battery_health(struct regmap *regmap, int *val)

{

	int ret;

	unsigned int status;
@@ -148,7 +146,7 @@ static int act8945a_get_battery_health(struct act8945a_charger *charger, 
	if (ret < 0)

		return ret;



	if (charger->battery_temperature && !(status & APCH_STATUS_TEMPDAT))

	if (!(status & APCH_STATUS_TEMPDAT))

		*val = POWER_SUPPLY_HEALTH_OVERHEAT;

	else if (!(status & APCH_STATUS_INDAT))

		*val = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
@@ -188,8 +186,7 @@ static int act8945a_charger_get_property(struct power_supply *psy, 
		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;

		break;

	case POWER_SUPPLY_PROP_HEALTH:

		ret = act8945a_get_battery_health(charger,

						  regmap, &val->intval);

		ret = act8945a_get_battery_health(regmap, &val->intval);

		break;

	case POWER_SUPPLY_PROP_MODEL_NAME:

		val->strval = act8945a_charger_model;
@@ -235,9 +232,6 @@ static int act8945a_charger_config(struct device *dev, 
		return -EINVAL;

	}



	charger->battery_temperature = of_property_read_bool(np,

				"active-semi,check-battery-temperature");



	chglev_pin = of_get_named_gpio_flags(np,

				"active-semi,chglev-gpios", 0, &flags);