From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Tejun Heo <tj@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
"David S . Miller" <davem@davemloft.net>,
David Airlie <airlied@linux.ie>,
Andrew Morton <akpm@linux-foundation.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 5/9] power: charger_manager: convert to use match_string() helper
Date: Thu, 28 Jan 2016 15:14:21 +0200 [thread overview]
Message-ID: <1453986865-133572-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1453986865-133572-1-git-send-email-andriy.shevchenko@linux.intel.com>
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>
---
drivers/power/charger-manager.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 1ea5d1a..e664ca7 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -2020,27 +2020,6 @@ static void __exit charger_manager_cleanup(void)
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
* @psy: pointer to instance of charger's power_supply
* @type: type of charger event
@@ -2057,9 +2036,11 @@ void cm_notify_event(struct power_supply *psy, enum cm_event_types type,
mutex_lock(&cm_list_mtx);
list_for_each_entry(cm, &cm_list, entry) {
- found_power_supply = find_power_supply(cm, psy);
- if (found_power_supply)
+ if (match_string(cm->desc->psy_charger_stat, -1,
+ psy->desc->name) >= 0) {
+ found_power_supply = true;
break;
+ }
}
mutex_unlock(&cm_list_mtx);
--
2.7.0.rc3
next prev parent reply other threads:[~2016-01-28 13:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 13:14 [PATCH v4 0/9] lib/string: introduce match_string() helper Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 1/9] " Andy Shevchenko
2016-02-02 6:05 ` Andrew Morton
2016-02-02 8:00 ` Andy Shevchenko
2016-02-02 19:50 ` Rasmus Villemoes
2016-01-28 13:14 ` [PATCH v4 2/9] device property: convert to use " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 3/9] pinctrl: " Andy Shevchenko
2016-02-02 6:02 ` Andrew Morton
2016-02-02 8:08 ` Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 4/9] drm/edid: " Andy Shevchenko
2016-01-28 13:14 ` Andy Shevchenko [this message]
2016-01-28 13:14 ` [PATCH v4 6/9] power: ab8500: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 7/9] ata: hpt366: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 8/9] ide: " Andy Shevchenko
2016-01-28 13:14 ` [PATCH v4 9/9] usb: common: " Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453986865-133572-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=dbaryshkov@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).