diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-01-03 19:00:20 +0200 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2017-01-09 19:56:58 +0100 |
| commit | 200d0177b4623cf218239ad7a21466459c174bff (patch) | |
| tree | 3b7bb4a74bf3c313eb9a4bb9edce1bf7202fbd0d /drivers/gpio/devres.c | |
| parent | gpio: of: Add support for multiple GPIOs in a single GPIO hog (diff) | |
| download | linux-dev-200d0177b4623cf218239ad7a21466459c174bff.tar.xz linux-dev-200d0177b4623cf218239ad7a21466459c174bff.zip | |
gpio: devres: Use global array of gpio suffixes
We have already a global array of possible GPIO suffixes. Use it here instead
of another copy of them.
Unfortunately this will not reduce the memory footprint, though allows to easy
maintain list in only one place.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/devres.c')
| -rw-r--r-- | drivers/gpio/devres.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c index b1c41db52089..2c49a8bc9e3f 100644 --- a/drivers/gpio/devres.c +++ b/drivers/gpio/devres.c @@ -21,6 +21,8 @@ #include <linux/device.h> #include <linux/gfp.h> +#include "gpiolib.h" + static void devm_gpiod_release(struct device *dev, void *res) { struct gpio_desc **desc = res; @@ -135,7 +137,6 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, const char *con_id, struct fwnode_handle *child) { - static const char * const suffixes[] = { "gpios", "gpio" }; char prop_name[32]; /* 32 is max size of property name */ struct gpio_desc **dr; struct gpio_desc *desc; @@ -146,13 +147,13 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev, if (!dr) return ERR_PTR(-ENOMEM); - for (i = 0; i < ARRAY_SIZE(suffixes); i++) { + for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) { if (con_id) snprintf(prop_name, sizeof(prop_name), "%s-%s", - con_id, suffixes[i]); + con_id, gpio_suffixes[i]); else snprintf(prop_name, sizeof(prop_name), "%s", - suffixes[i]); + gpio_suffixes[i]); desc = fwnode_get_named_gpiod(child, prop_name); if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT)) |