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

Commit 465c436b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Sebastian Reichel
Browse files

power_supply: 88pm860x_charger: Use power_supply_*() API for accessing function attrs 



Replace direct calls to power supply function attributes with wrappers.
Wrappers provide safe access in case of unregistering the power
supply (e.g. by removing the driver). Replace:
 - get_property -> power_supply_get_property
 - set_property -> power_supply_set_property

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent ee8f334a

drivers/power/88pm860x_charger.c

+8 −5
Original line number Diff line number Diff line
@@ -296,12 +296,13 @@ static int set_charging_fsm(struct pm860x_charger_info *info) 
	psy = power_supply_get_by_name(pm860x_supplied_to[0]);

	if (!psy)

		return -EINVAL;

	ret = psy->get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &data);

	ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,

			&data);

	if (ret)

		return ret;

	vbatt = data.intval / 1000;



	ret = psy->get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data);

	ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data);

	if (ret)

		return ret;
@@ -430,7 +431,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data) 
	psy = power_supply_get_by_name(pm860x_supplied_to[0]);

	if (!psy)

		goto out;

	ret = psy->get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);

	ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);

	if (ret)

		goto out;

	value = temp.intval / 10;
@@ -485,7 +486,8 @@ static irqreturn_t pm860x_done_handler(int irq, void *data) 
	psy = power_supply_get_by_name(pm860x_supplied_to[0]);

	if (!psy)

		goto out;

	ret = psy->get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &val);

	ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW,

			&val);

	if (ret)

		goto out;

	vbatt = val.intval / 1000;
@@ -500,7 +502,8 @@ static irqreturn_t pm860x_done_handler(int irq, void *data) 
	if (ret < 0)

		goto out;

	if (vbatt > CHARGE_THRESHOLD && ret & STATUS2_CHG)

		psy->set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL, &val);

		power_supply_set_property(psy, POWER_SUPPLY_PROP_CHARGE_FULL,

				&val);



out:

	mutex_unlock(&info->lock);