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

Commit ea32cea1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

power: ab8500: convert to use match_string() helper 



The new helper returns index of the mathing string in an array.  We
would use it here.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5f476822

drivers/power/ab8500_btemp.c

+5 −10
Original line number Diff line number Diff line
@@ -906,26 +906,21 @@ static int ab8500_btemp_get_property(struct power_supply *psy, 
static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data)

{

	struct power_supply *psy;

	struct power_supply *ext;

	struct power_supply *ext = dev_get_drvdata(dev);

	const char **supplicants = (const char **)ext->supplied_to;

	struct ab8500_btemp *di;

	union power_supply_propval ret;

	int i, j;

	bool psy_found = false;

	int j;



	psy = (struct power_supply *)data;

	ext = dev_get_drvdata(dev);

	di = power_supply_get_drvdata(psy);



	/*

	 * For all psy where the name of your driver

	 * appears in any supplied_to

	 */

	for (i = 0; i < ext->num_supplicants; i++) {

		if (!strcmp(ext->supplied_to[i], psy->desc->name))

			psy_found = true;

	}



	if (!psy_found)

	j = match_string(supplicants, ext->num_supplicants, psy->desc->name);

	if (j < 0)

		return 0;



	/* Go through all properties for the psy */

drivers/power/ab8500_charger.c

+5 −11
Original line number Diff line number Diff line
@@ -1929,11 +1929,11 @@ static int ab8540_charger_usb_pre_chg_enable(struct ux500_charger *charger, 
static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data)

{

	struct power_supply *psy;

	struct power_supply *ext;

	struct power_supply *ext = dev_get_drvdata(dev);

	const char **supplicants = (const char **)ext->supplied_to;

	struct ab8500_charger *di;

	union power_supply_propval ret;

	int i, j;

	bool psy_found = false;

	int j;

	struct ux500_charger *usb_chg;



	usb_chg = (struct ux500_charger *)data;
@@ -1941,15 +1941,9 @@ static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data) 


	di = to_ab8500_charger_usb_device_info(usb_chg);



	ext = dev_get_drvdata(dev);



	/* For all psy where the driver name appears in any supplied_to */

	for (i = 0; i < ext->num_supplicants; i++) {

		if (!strcmp(ext->supplied_to[i], psy->desc->name))

			psy_found = true;

	}



	if (!psy_found)

	j = match_string(supplicants, ext->num_supplicants, psy->desc->name);

	if (j < 0)

		return 0;



	/* Go through all properties for the psy */

drivers/power/ab8500_fg.c

+5 −10
Original line number Diff line number Diff line
@@ -2168,26 +2168,21 @@ static int ab8500_fg_get_property(struct power_supply *psy, 
static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data)

{

	struct power_supply *psy;

	struct power_supply *ext;

	struct power_supply *ext = dev_get_drvdata(dev);

	const char **supplicants = (const char **)ext->supplied_to;

	struct ab8500_fg *di;

	union power_supply_propval ret;

	int i, j;

	bool psy_found = false;

	int j;



	psy = (struct power_supply *)data;

	ext = dev_get_drvdata(dev);

	di = power_supply_get_drvdata(psy);



	/*

	 * For all psy where the name of your driver

	 * appears in any supplied_to

	 */

	for (i = 0; i < ext->num_supplicants; i++) {

		if (!strcmp(ext->supplied_to[i], psy->desc->name))

			psy_found = true;

	}



	if (!psy_found)

	j = match_string(supplicants, ext->num_supplicants, psy->desc->name);

	if (j < 0)

		return 0;



	/* Go through all properties for the psy */

drivers/power/abx500_chargalg.c

+5 −9
Original line number Diff line number Diff line
@@ -975,22 +975,18 @@ static void handle_maxim_chg_curr(struct abx500_chargalg *di) 
static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data)

{

	struct power_supply *psy;

	struct power_supply *ext;

	struct power_supply *ext = dev_get_drvdata(dev);

	const char **supplicants = (const char **)ext->supplied_to;

	struct abx500_chargalg *di;

	union power_supply_propval ret;

	int i, j;

	bool psy_found = false;

	int j;

	bool capacity_updated = false;



	psy = (struct power_supply *)data;

	ext = dev_get_drvdata(dev);

	di = power_supply_get_drvdata(psy);

	/* For all psy where the driver name appears in any supplied_to */

	for (i = 0; i < ext->num_supplicants; i++) {

		if (!strcmp(ext->supplied_to[i], psy->desc->name))

			psy_found = true;

	}

	if (!psy_found)

	j = match_string(supplicants, ext->num_supplicants, psy->desc->name);

	if (j < 0)

		return 0;



	/*