summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-05-03 20:14:46 +0300
committerLinus Walleij <linus.walleij@linaro.org>2018-05-16 14:35:24 +0200
commit4b21f94a3001ba5326425d6b6d93bc63ddebdc97 (patch)
tree64c8f3b0cc1d57b0964ca766c67f0e89ecd102f6 /drivers/gpio
parent6906a4f9d10b27853e80998afcfb290d8f91c071 (diff)
downloadlinux-stable-4b21f94a3001ba5326425d6b6d93bc63ddebdc97.tar.gz
linux-stable-4b21f94a3001ba5326425d6b6d93bc63ddebdc97.tar.bz2
linux-stable-4b21f94a3001ba5326425d6b6d93bc63ddebdc97.zip
gpio: Convert to use match_string() helper
The new helper returns index of the matching string in an array. We are going to use it here. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpiolib-of.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 586d15137c03..28d968088131 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -210,11 +210,8 @@ static struct gpio_desc *of_find_regulator_gpio(struct device *dev, const char *
if (!con_id)
return ERR_PTR(-ENOENT);
- for (i = 0; i < ARRAY_SIZE(whitelist); i++)
- if (!strcmp(con_id, whitelist[i]))
- break;
-
- if (i == ARRAY_SIZE(whitelist))
+ i = match_string(whitelist, ARRAY_SIZE(whitelist), con_id);
+ if (i < 0)
return ERR_PTR(-ENOENT);
desc = of_get_named_gpiod_flags(np, con_id, 0, of_flags);