[PATCH v1 2/3] gpiolib: Fix debug messaging in gpiod_find_and_request()
From: Andy Shevchenko
Date: Thu Oct 19 2023 - 13:35:24 EST
When consolidating GPIO lookups in ACPI code, the debug messaging
had been broken and hence lost a bit of sense. Restore debug
messaging in gpiod_find_and_request() when configuring the GPIO
line via gpiod_configure_flags().
Reported-by: Ferry Toth <ftoth@xxxxxxxxxxxxxx>
Fixes: 8eb1f71e7acc ("gpiolib: consolidate GPIO lookups")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/gpio/gpiolib-acpi.c | 9 ++++-----
drivers/gpio/gpiolib-acpi.h | 13 +++++++------
drivers/gpio/gpiolib-of.c | 13 +++++++------
drivers/gpio/gpiolib-of.h | 8 ++++----
drivers/gpio/gpiolib-swnode.c | 4 ++--
drivers/gpio/gpiolib-swnode.h | 1 +
drivers/gpio/gpiolib.c | 21 ++++++++++++++-------
7 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 51e41676de0b..a2899b2a58bd 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -973,24 +973,23 @@ static bool acpi_can_fallback_to_crs(struct acpi_device *adev,
}
struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
- const char *con_id,
- unsigned int idx,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
enum gpiod_flags *dflags,
unsigned long *lookupflags)
{
struct acpi_device *adev = to_acpi_device_node(fwnode);
struct acpi_gpio_info info;
struct gpio_desc *desc;
- char propname[32];
int i;
/* Try first from _DSD */
for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
if (con_id) {
- snprintf(propname, sizeof(propname), "%s-%s",
+ snprintf(propname, propsize, "%s-%s",
con_id, gpio_suffixes[i]);
} else {
- snprintf(propname, sizeof(propname), "%s",
+ snprintf(propname, propsize, "%s",
gpio_suffixes[i]);
}
diff --git a/drivers/gpio/gpiolib-acpi.h b/drivers/gpio/gpiolib-acpi.h
index 0fcd7e14d7f9..b5f0de249765 100644
--- a/drivers/gpio/gpiolib-acpi.h
+++ b/drivers/gpio/gpiolib-acpi.h
@@ -28,8 +28,8 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip);
void acpi_gpiochip_free_interrupts(struct gpio_chip *chip);
struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
- const char *con_id,
- unsigned int idx,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
enum gpiod_flags *dflags,
unsigned long *lookupflags);
@@ -44,10 +44,11 @@ acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { }
static inline void
acpi_gpiochip_free_interrupts(struct gpio_chip *chip) { }
-static inline struct gpio_desc *
-acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id,
- unsigned int idx, enum gpiod_flags *dflags,
- unsigned long *lookupflags)
+static inline struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
+ enum gpiod_flags *dflags,
+ unsigned long *lookupflags)
{
return ERR_PTR(-ENOENT);
}
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 531faabead0f..017ee5cbfb60 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -621,10 +621,11 @@ static const of_find_gpio_quirk of_find_gpio_quirks[] = {
NULL
};
-struct gpio_desc *of_find_gpio(struct device_node *np, const char *con_id,
- unsigned int idx, unsigned long *flags)
+struct gpio_desc *of_find_gpio(struct device_node *np,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
+ unsigned long *flags)
{
- char prop_name[32]; /* 32 is max size of property name */
enum of_gpio_flags of_flags;
const of_find_gpio_quirk *q;
struct gpio_desc *desc;
@@ -633,13 +634,13 @@ struct gpio_desc *of_find_gpio(struct device_node *np, const char *con_id,
/* Try GPIO property "foo-gpios" and "foo-gpio" */
for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
if (con_id)
- snprintf(prop_name, sizeof(prop_name), "%s-%s", con_id,
+ snprintf(propname, propsize, "%s-%s", con_id,
gpio_suffixes[i]);
else
- snprintf(prop_name, sizeof(prop_name), "%s",
+ snprintf(propname, propsize, "%s",
gpio_suffixes[i]);
- desc = of_get_named_gpiod_flags(np, prop_name, idx, &of_flags);
+ desc = of_get_named_gpiod_flags(np, propname, idx, &of_flags);
if (!gpiod_not_found(desc))
break;
diff --git a/drivers/gpio/gpiolib-of.h b/drivers/gpio/gpiolib-of.h
index 6b3a5347c5d9..c2517e7913ee 100644
--- a/drivers/gpio/gpiolib-of.h
+++ b/drivers/gpio/gpiolib-of.h
@@ -16,16 +16,16 @@ struct gpio_device;
#ifdef CONFIG_OF_GPIO
struct gpio_desc *of_find_gpio(struct device_node *np,
- const char *con_id,
- unsigned int idx,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
unsigned long *lookupflags);
int of_gpiochip_add(struct gpio_chip *gc);
void of_gpiochip_remove(struct gpio_chip *gc);
int of_gpio_get_count(struct device *dev, const char *con_id);
#else
static inline struct gpio_desc *of_find_gpio(struct device_node *np,
- const char *con_id,
- unsigned int idx,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
unsigned long *lookupflags)
{
return ERR_PTR(-ENOENT);
diff --git a/drivers/gpio/gpiolib-swnode.c b/drivers/gpio/gpiolib-swnode.c
index b5a6eaf3729b..12c94f620f6b 100644
--- a/drivers/gpio/gpiolib-swnode.c
+++ b/drivers/gpio/gpiolib-swnode.c
@@ -51,20 +51,20 @@ static struct gpio_chip *swnode_get_chip(struct fwnode_handle *fwnode)
struct gpio_desc *swnode_find_gpio(struct fwnode_handle *fwnode,
const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
unsigned long *flags)
{
const struct software_node *swnode;
struct fwnode_reference_args args;
struct gpio_chip *chip;
struct gpio_desc *desc;
- char propname[32]; /* 32 is max size of property name */
int error;
swnode = to_software_node(fwnode);
if (!swnode)
return ERR_PTR(-EINVAL);
- swnode_format_propname(con_id, propname, sizeof(propname));
+ swnode_format_propname(con_id, propname, propsize);
/*
* We expect all swnode-described GPIOs have GPIO number and
diff --git a/drivers/gpio/gpiolib-swnode.h b/drivers/gpio/gpiolib-swnode.h
index af849e56f6bc..b75fbb1fa7a6 100644
--- a/drivers/gpio/gpiolib-swnode.h
+++ b/drivers/gpio/gpiolib-swnode.h
@@ -8,6 +8,7 @@ struct gpio_desc;
struct gpio_desc *swnode_find_gpio(struct fwnode_handle *fwnode,
const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
unsigned long *flags);
int swnode_gpio_count(const struct fwnode_handle *fwnode, const char *con_id);
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 40a0022ea719..beac3031246e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3938,8 +3938,8 @@ static int platform_gpio_count(struct device *dev, const char *con_id)
static struct gpio_desc *gpiod_find_by_fwnode(struct fwnode_handle *fwnode,
struct device *consumer,
- const char *con_id,
- unsigned int idx,
+ const char *con_id, unsigned int idx,
+ char *propname, size_t propsize,
enum gpiod_flags *flags,
unsigned long *lookupflags)
{
@@ -3948,15 +3948,18 @@ static struct gpio_desc *gpiod_find_by_fwnode(struct fwnode_handle *fwnode,
if (is_of_node(fwnode)) {
dev_dbg(consumer, "using DT '%pfw' for '%s' GPIO lookup\n",
fwnode, con_id);
- desc = of_find_gpio(to_of_node(fwnode), con_id, idx, lookupflags);
+ desc = of_find_gpio(to_of_node(fwnode), con_id, idx, propname, propsize,
+ lookupflags);
} else if (is_acpi_node(fwnode)) {
dev_dbg(consumer, "using ACPI '%pfw' for '%s' GPIO lookup\n",
fwnode, con_id);
- desc = acpi_find_gpio(fwnode, con_id, idx, flags, lookupflags);
+ desc = acpi_find_gpio(fwnode, con_id, idx, propname, propsize,
+ flags, lookupflags);
} else if (is_software_node(fwnode)) {
dev_dbg(consumer, "using swnode '%pfw' for '%s' GPIO lookup\n",
fwnode, con_id);
- desc = swnode_find_gpio(fwnode, con_id, idx, lookupflags);
+ desc = swnode_find_gpio(fwnode, con_id, idx, propname, propsize,
+ lookupflags);
}
return desc;
@@ -3970,11 +3973,15 @@ static struct gpio_desc *gpiod_find_and_request(struct device *consumer,
const char *label,
bool platform_lookup_allowed)
{
+ char propname[32] = ""; /* 32 is max size of property name */
+ const char *funcname = con_id ?: propname;
unsigned long lookupflags = GPIO_LOOKUP_FLAGS_DEFAULT;
struct gpio_desc *desc;
int ret;
- desc = gpiod_find_by_fwnode(fwnode, consumer, con_id, idx, &flags, &lookupflags);
+ desc = gpiod_find_by_fwnode(fwnode, consumer, con_id, idx,
+ propname, sizeof(propname),
+ &flags, &lookupflags);
if (gpiod_not_found(desc) && platform_lookup_allowed) {
/*
* Either we are not using DT or ACPI, or their lookup did not
@@ -4012,7 +4019,7 @@ static struct gpio_desc *gpiod_find_and_request(struct device *consumer,
return desc;
}
- ret = gpiod_configure_flags(desc, con_id, lookupflags, flags);
+ ret = gpiod_configure_flags(desc, funcname, lookupflags, flags);
if (ret < 0) {
dev_dbg(consumer, "setup of GPIO %s failed\n", con_id);
gpiod_put(desc);
--
2.40.0.1.gaa8946217a0b