openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andy Shevchenko 2016-03-17 14:22:29 -07:00 committed by Linus Torvalds
parent 5f4768225c
commit ea32cea140
4 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/power/ab8500_btemp.c
View File

@ -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) static int ab8500_btemp_get_ext_psy_data(struct device *dev, void *data)
{ {
struct power_supply *psy; 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; struct ab8500_btemp *di;
union power_supply_propval ret; union power_supply_propval ret;
int i, j; int j;
bool psy_found = false;
psy = (struct power_supply *)data; psy = (struct power_supply *)data;
ext = dev_get_drvdata(dev);
di = power_supply_get_drvdata(psy); di = power_supply_get_drvdata(psy);
/* /*
* For all psy where the name of your driver * For all psy where the name of your driver
* appears in any supplied_to * appears in any supplied_to
*/ */
for (i = 0; i < ext->num_supplicants; i++) { j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
if (!strcmp(ext->supplied_to[i], psy->desc->name)) if (j < 0)
psy_found = true;
}
if (!psy_found)
return 0; return 0;
/* Go through all properties for the psy */ /* Go through all properties for the psy */

16
drivers/power/ab8500_charger.c
View File

@ -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) static int ab8500_charger_get_ext_psy_data(struct device *dev, void *data)
{ {
struct power_supply *psy; 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; struct ab8500_charger *di;
union power_supply_propval ret; union power_supply_propval ret;
int i, j; int j;
bool psy_found = false;
struct ux500_charger *usb_chg; struct ux500_charger *usb_chg;
usb_chg = (struct ux500_charger *)data; 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); 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 all psy where the driver name appears in any supplied_to */
for (i = 0; i < ext->num_supplicants; i++) { j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
if (!strcmp(ext->supplied_to[i], psy->desc->name)) if (j < 0)
psy_found = true;
}
if (!psy_found)
return 0; return 0;
/* Go through all properties for the psy */ /* Go through all properties for the psy */

15
drivers/power/ab8500_fg.c
View File

@ -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) static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data)
{ {
struct power_supply *psy; 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; struct ab8500_fg *di;
union power_supply_propval ret; union power_supply_propval ret;
int i, j; int j;
bool psy_found = false;
psy = (struct power_supply *)data; psy = (struct power_supply *)data;
ext = dev_get_drvdata(dev);
di = power_supply_get_drvdata(psy); di = power_supply_get_drvdata(psy);
/* /*
* For all psy where the name of your driver * For all psy where the name of your driver
* appears in any supplied_to * appears in any supplied_to
*/ */
for (i = 0; i < ext->num_supplicants; i++) { j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
if (!strcmp(ext->supplied_to[i], psy->desc->name)) if (j < 0)
psy_found = true;
}
if (!psy_found)
return 0; return 0;
/* Go through all properties for the psy */ /* Go through all properties for the psy */

14
drivers/power/abx500_chargalg.c
View File

@ -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) static int abx500_chargalg_get_ext_psy_data(struct device *dev, void *data)
{ {
struct power_supply *psy; 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; struct abx500_chargalg *di;
union power_supply_propval ret; union power_supply_propval ret;
int i, j; int j;
bool psy_found = false;
bool capacity_updated = false; bool capacity_updated = false;
psy = (struct power_supply *)data; psy = (struct power_supply *)data;
ext = dev_get_drvdata(dev);
di = power_supply_get_drvdata(psy); di = power_supply_get_drvdata(psy);
/* For all psy where the driver name appears in any supplied_to */ /* For all psy where the driver name appears in any supplied_to */
for (i = 0; i < ext->num_supplicants; i++) { j = match_string(supplicants, ext->num_supplicants, psy->desc->name);
if (!strcmp(ext->supplied_to[i], psy->desc->name)) if (j < 0)
psy_found = true;
}
if (!psy_found)
return 0; return 0;
/* /*