iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power: charger_manager: convert to use match_string() helper

Browse Source 
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>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.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:26 -07:00 committed by Linus Torvalds
parent 7a5cf52dbb
commit 5f4768225c
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/power/charger-manager.c
View File

@ -2019,27 +2019,6 @@ static void __exit charger_manager_cleanup(void)
} }
module_exit(charger_manager_cleanup); module_exit(charger_manager_cleanup);
/**
* find_power_supply - find the associated power_supply of charger
* @cm: the Charger Manager representing the battery
* @psy: pointer to instance of charger's power_supply
*/
static bool find_power_supply(struct charger_manager *cm,
struct power_supply *psy)
{
int i;
bool found = false;
for (i = 0; cm->desc->psy_charger_stat[i]; i++) {
if (!strcmp(psy->desc->name, cm->desc->psy_charger_stat[i])) {
found = true;
break;
}
}
return found;
}
/** /**
* cm_notify_event - charger driver notify Charger Manager of charger event * cm_notify_event - charger driver notify Charger Manager of charger event
* @psy: pointer to instance of charger's power_supply * @psy: pointer to instance of charger's power_supply
@ -2057,10 +2036,12 @@ void cm_notify_event(struct power_supply *psy, enum cm_event_types type,
mutex_lock(&cm_list_mtx); mutex_lock(&cm_list_mtx);
list_for_each_entry(cm, &cm_list, entry) { list_for_each_entry(cm, &cm_list, entry) {
found_power_supply = find_power_supply(cm, psy); if (match_string(cm->desc->psy_charger_stat, -1,
if (found_power_supply) psy->desc->name) >= 0) {
found_power_supply = true;
break; break;
} }
}
mutex_unlock(&cm_list_mtx); mutex_unlock(&cm_list_mtx);
if (!found_power_supply) if (!found_power_supply)