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


Groups > linux.kernel > #1607845

[PATCH v1 2/8] gpio: acpi: Align acpi_find_gpio() with DT version

From Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Newsgroups linux.kernel
Subject [PATCH v1 2/8] gpio: acpi: Align acpi_find_gpio() with DT version
Date 2017-03-23 20:50 +0100
Message-ID <togU9-6WV-13@gated-at.bofh.it> (permalink)
References <togU9-6WV-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


By some reason acpi_find_gpio() and acpi_gpio_count() have compared connection
ID to "gpios" when tries to check if suffix is needed or not.

Don't do any assumptions about what connection ID can be and, when defined, use
it only with suffix as it's done in the device tree version.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/gpio/gpiolib-acpi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 56a6b1be3a17..3bda3166d418 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -593,7 +593,7 @@ struct gpio_desc *acpi_find_gpio(struct device *dev,
 
 	/* Try first from _DSD */
 	for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
-		if (con_id && strcmp(con_id, "gpios")) {
+		if (con_id) {
 			snprintf(propname, sizeof(propname), "%s-%s",
 				 con_id, gpio_suffixes[i]);
 		} else {
@@ -1081,7 +1081,7 @@ int acpi_gpio_count(struct device *dev, const char *con_id)
 
 	/* Try first from _DSD */
 	for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
-		if (con_id && strcmp(con_id, "gpios"))
+		if (con_id)
 			snprintf(propname, sizeof(propname), "%s-%s",
 				 con_id, gpio_suffixes[i]);
 		else
-- 
2.11.0

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


Thread

[PATCH v1 0/8] gpio: acpi: Make it working Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
  [PATCH v1 3/8] gpio: acpi: Do sanity check for GpioInt in acpi_find_gpio() Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
    Re: [PATCH v1 3/8] gpio: acpi: Do sanity check for GpioInt in  acpi_find_gpio() Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-03-23 21:30 +0100
  [PATCH v1 4/8] gpio: acpi: Even more tighten up ACPI GPIO lookups Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
    Re: [PATCH v1 4/8] gpio: acpi: Even more tighten up ACPI GPIO lookups Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-03-23 21:20 +0100
      Re: [PATCH v1 4/8] gpio: acpi: Even more tighten up ACPI GPIO  lookups Bastien Nocera <hadess@hadess.net> - 2017-03-24 11:50 +0100
  [PATCH v1 2/8] gpio: acpi: Align acpi_find_gpio() with DT version Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
    Re: [PATCH v1 2/8] gpio: acpi: Align acpi_find_gpio() with DT version Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-03-23 21:20 +0100
  [PATCH v1 6/8] gpio: acpi: Explain how to get GPIO descriptors in ACPI case Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
    Re: [PATCH v1 6/8] gpio: acpi: Explain how to get GPIO descriptors  in ACPI case Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-03-23 21:30 +0100
  [PATCH v1 5/8] gpio: acpi: Synchronize acpi_find_gpio() and acpi_gpio_count() Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
    Re: [PATCH v1 5/8] gpio: acpi: Synchronize acpi_find_gpio() and  acpi_gpio_count() Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-03-24 17:00 +0100
  [PATCH v1 8/8] gpio: acpi: Override GPIO initialization flags Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-03-23 20:50 +0100
  Re: [PATCH v1 0/8] gpio: acpi: Make it working Jarkko Nikula <jarkko.nikula@linux.intel.com> - 2017-03-24 15:00 +0100
  Re: [PATCH v1 0/8] gpio: acpi: Make it working Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-03-24 17:10 +0100

csiph-web