Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1303519

[PATCH v1 5/8] power: charger_manager: convert to use match_string() helper

From Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Newsgroups linux.kernel
Subject [PATCH v1 5/8] power: charger_manager: convert to use match_string() helper
Date 2016-01-07 13:10 +0100
Message-ID <qOhya-7Vb-33@gated-at.bofh.it> (permalink)
References <qOhy9-7Vb-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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..5939251 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, 0,
+				 psy->desc->name) >= 0) {
+			found_power_supply = true;
 			break;
+		}
 	}
 	mutex_unlock(&cm_list_mtx);
 
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
  [PATCH v1 8/8] ide: hpt366: convert to use match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
  [PATCH v1 2/8] device property: convert to use match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
    Re: [PATCH v1 2/8] device property: convert to use match_string()  helper Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-01-08 14:10 +0100
  [PATCH v1 6/8] power: ab8500: convert to use match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
    Re: [PATCH v1 6/8] power: ab8500: convert to use match_string() helper Linus Walleij <linus.walleij@linaro.org> - 2016-01-07 16:20 +0100
  [PATCH v1 7/8] ata: hpt366: convert to use match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
    Re: [PATCH v1 7/8] ata: hpt366: convert to use match_string() helper Tejun Heo <tj@kernel.org> - 2016-01-07 16:50 +0100
  [PATCH v1 5/8] power: charger_manager: convert to use match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
  [PATCH v1 4/8] drm/edid: convert to use match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 13:10 +0100
  Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-01-07 14:10 +0100
    Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-07 14:20 +0100
      Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2016-01-07 14:30 +0100
  Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-07 23:10 +0100
    Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-08 09:50 +0100
  Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-01-08 01:20 +0100
    Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-08 09:50 +0100
      Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Sergey Senozhatsky <sergey.senozhatsky@gmail.com> - 2016-01-09 02:20 +0100
        Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-01-09 13:00 +0100
          Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-01-11 16:00 +0100
            Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-01-11 23:20 +0100
              Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-01-11 23:30 +0100
              Re: [PATCH v1 1/8] lib/string: introduce match_string() helper Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-01-12 09:30 +0100

csiph-web