diff mbox series

[v1,3/4] gpiolib: acpi: Move acpi_can_fallback_to_crs() out of __acpi_find_gpio()

Message ID 20240411172540.4122581-5-andriy.shevchenko@linux.intel.com
State Accepted
Commit 49c02f6e901ca0bcf8c68a0ec8909892eaf43d0d
Headers show
Series gpiolib: acpi: Use con_id in acpi_dev_gpio_irq_get_by() | expand

Commit Message

Andy Shevchenko April 11, 2024, 5:22 p.m. UTC 
New coming user may need to check for _CRS fallback slightly differently.
Move the current check out of the helper function to allow that user to
use it.

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

Patch

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index fb2e14670b7a..2b3fd43b13fc 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -947,7 +947,7 @@  static bool acpi_can_fallback_to_crs(struct acpi_device *adev,
 
 static struct gpio_desc *
 __acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int idx,
-		 struct acpi_gpio_info *info)
+		 bool can_fallback, struct acpi_gpio_info *info)
 {
 	struct acpi_device *adev = to_acpi_device_node(fwnode);
 	struct gpio_desc *desc;
@@ -978,7 +978,7 @@  __acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int
 	}
 
 	/* Then from plain _CRS GPIOs */
-	if (!adev || !acpi_can_fallback_to_crs(adev, con_id))
+	if (!adev || !can_fallback)
 		return ERR_PTR(-ENOENT);
 
 	return acpi_get_gpiod_by_index(adev, NULL, idx, info);
@@ -991,10 +991,11 @@  struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
 				 unsigned long *lookupflags)
 {
 	struct acpi_device *adev = to_acpi_device_node(fwnode);
+	bool can_fallback = acpi_can_fallback_to_crs(adev, con_id);
 	struct acpi_gpio_info info;
 	struct gpio_desc *desc;
 
-	desc = __acpi_find_gpio(fwnode, con_id, idx, &info);
+	desc = __acpi_find_gpio(fwnode, con_id, idx, can_fallback, &info);
 	if (IS_ERR(desc))
 		return desc;