Merge branch 'akpm' (patches from Andrew)

Merge second patch-bomb from Andrew Morton:

 - a couple of hotfixes

 - the rest of MM

 - a new timer slack control in procfs

 - a couple of procfs fixes

 - a few misc things

 - some printk tweaks

 - lib/ updates, notably to radix-tree.

 - add my and Nick Piggin's old userspace radix-tree test harness to
   tools/testing/radix-tree/.  Matthew said it was a godsend during the
   radix-tree work he did.

 - a few code-size improvements, switching to __always_inline where gcc
   screwed up.

 - partially implement character sets in sscanf

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  sscanf: implement basic character sets
  lib/bug.c: use common WARN helper
  param: convert some "on"/"off" users to strtobool
  lib: add "on"/"off" support to kstrtobool
  lib: update single-char callers of strtobool()
  lib: move strtobool() to kstrtobool()
  include/linux/unaligned: force inlining of byteswap operations
  include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
  include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
  usb: common: convert to use match_string() helper
  ide: hpt366: convert to use match_string() helper
  ata: hpt366: convert to use match_string() helper
  power: ab8500: convert to use match_string() helper
  power: charger_manager: convert to use match_string() helper
  drm/edid: convert to use match_string() helper
  pinctrl: convert to use match_string() helper
  device property: convert to use match_string() helper
  lib/string: introduce match_string() helper
  radix-tree tests: add test for radix_tree_iter_next
  radix-tree tests: add regression3 test
  ...

5 files changed, 24 insertions, 63 deletions

diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index 8f8044e1acf3..bf2e5dd301e7 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -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 */
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index e388171f4e58..30de5d42b26a 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -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 */
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 3830dade5d69..5a36cf88578a 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -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 */
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 541f702e0451..d9104b1ab7cf 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -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;
 
         /*
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 1ea5d1aa268b..e664ca7c0afd 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);