Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f2e553a authored by Rojhalat Ibrahim's avatar Rojhalat Ibrahim Committed by Linus Walleij
Browse files

gpiolib: define gpio suffixes globally 



Avoid multiple identical definitions of the gpio suffix strings by putting
them into a global constant array.

Signed-off-by: default avatarRojhalat Ibrahim <imr@rtschenk.de>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1feb57a2

drivers/gpio/gpiolib.c

+6 −8
Original line number Diff line number Diff line
@@ -1662,19 +1662,18 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 
				      unsigned int idx,

				      enum gpio_lookup_flags *flags)

{

	static const char * const suffixes[] = { "gpios", "gpio" };

	char prop_name[32]; /* 32 is max size of property name */

	enum of_gpio_flags of_flags;

	struct gpio_desc *desc;

	unsigned int i;



	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]);

				 gpio_suffixes[i]);

		else

			snprintf(prop_name, sizeof(prop_name), "%s",

							       suffixes[i]);

				 gpio_suffixes[i]);



		desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,

						&of_flags);
@@ -1695,7 +1694,6 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, 
					unsigned int idx,

					enum gpio_lookup_flags *flags)

{

	static const char * const suffixes[] = { "gpios", "gpio" };

	struct acpi_device *adev = ACPI_COMPANION(dev);

	struct acpi_gpio_info info;

	struct gpio_desc *desc;
@@ -1703,13 +1701,13 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, 
	int i;



	/* Try first from _DSD */

	for (i = 0; i < ARRAY_SIZE(suffixes); i++) {

	for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {

		if (con_id && strcmp(con_id, "gpios")) {

			snprintf(propname, sizeof(propname), "%s-%s",

				 con_id, suffixes[i]);

				 con_id, gpio_suffixes[i]);

		} else {

			snprintf(propname, sizeof(propname), "%s",

				 suffixes[i]);

				 gpio_suffixes[i]);

		}



		desc = acpi_get_gpiod_by_index(adev, propname, idx, &info);

drivers/gpio/gpiolib.h

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ struct acpi_gpio_info { 
	bool active_low;

};



/* gpio suffixes used for ACPI and device tree lookup */

static const char * const gpio_suffixes[] = { "gpios", "gpio" };



#ifdef CONFIG_ACPI

void acpi_gpiochip_add(struct gpio_chip *chip);

void acpi_gpiochip_remove(struct gpio_chip *chip);