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

Commit 15077fc1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Sebastian Reichel
Browse files

power_supply: ab8500: 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

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>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
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 465c436b

drivers/power/ab8500_btemp.c

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data) 
		enum power_supply_property prop;

		prop = ext->properties[j];



		if (ext->get_property(ext, prop, &ret))

		if (power_supply_get_property(ext, prop, &ret))

			continue;



		switch (prop) {

drivers/power/ab8500_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -1957,7 +1957,7 @@ static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data) 
		enum power_supply_property prop;

		prop = ext->properties[j];



		if (ext->get_property(ext, prop, &ret))

		if (power_supply_get_property(ext, prop, &ret))

			continue;



		switch (prop) {

drivers/power/ab8500_fg.c

+1 −1
Original line number Diff line number Diff line
@@ -2200,7 +2200,7 @@ static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data) 
		enum power_supply_property prop;

		prop = ext->properties[j];



		if (ext->get_property(ext, prop, &ret))

		if (power_supply_get_property(ext, prop, &ret))

			continue;



		switch (prop) {

drivers/power/abx500_chargalg.c

+2 −2
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data) 
	 * property because of handling that sysfs entry on its own, this is

	 * the place to get the battery capacity.

	 */

	if (!ext->get_property(ext, POWER_SUPPLY_PROP_CAPACITY, &ret)) {

	if (!power_supply_get_property(ext, POWER_SUPPLY_PROP_CAPACITY, &ret)) {

		di->batt_data.percent = ret.intval;

		capacity_updated = true;

	}
@@ -1019,7 +1019,7 @@ static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data) 
			ext->type == POWER_SUPPLY_TYPE_USB)

			di->usb_chg = psy_to_ux500_charger(ext);



		if (ext->get_property(ext, prop, &ret))

		if (power_supply_get_property(ext, prop, &ret))

			continue;

		switch (prop) {

		case POWER_SUPPLY_PROP_PRESENT: