kevin/linux
1
Fork 0
Code

gpiolib: Pass consumer device through to core in devm_fwnode_gpiod_get_index()

Browse Source 
This devm API takes a consumer device as an argument to setup the devm
action, but throws it away when calling further into gpiolib. This leads
to odd debug messages like this:

 (NULL device *): using DT '/gpio-keys/switch-pen-insert' for '(null)' GPIO lookup

Let's pass the consumer device down, by directly calling what
fwnode_gpiod_get_index() calls but pass the device used for devm. This
changes the message to look like this instead:

 gpio-keys gpio-keys: using DT '/gpio-keys/switch-pen-insert' for '(null)' GPIO lookup

Note that callers of fwnode_gpiod_get_index() will still see the NULL
device pointer debug message, but there's not much we can do about that
because the API doesn't take a struct device.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Fixes: 8eb1f71e7a ("gpiolib: consolidate GPIO lookups")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
Stephen Boyd 2024-02-22 22:52:53 -08:00 committed by Bartosz Golaszewski
parent ebb03f692f
commit 0d776cfd5e
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpio/gpiolib-devres.c
View File

@ -158,7 +158,7 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,
if (!dr) if (!dr)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
desc = fwnode_gpiod_get_index(fwnode, con_id, index, flags, label); desc = gpiod_find_and_request(dev, fwnode, con_id, index, flags, label, false);
if (IS_ERR(desc)) { if (IS_ERR(desc)) {
devres_free(dr); devres_free(dr);
return desc; return desc;

14
drivers/gpio/gpiolib.c
View File

@ -4171,13 +4171,13 @@ static struct gpio_desc *gpiod_find_by_fwnode(struct fwnode_handle *fwnode,
return desc; return desc;
} }
static struct gpio_desc *gpiod_find_and_request(struct device *consumer, struct gpio_desc *gpiod_find_and_request(struct device *consumer,
struct fwnode_handle *fwnode, struct fwnode_handle *fwnode,
const char *con_id, const char *con_id,
unsigned int idx, unsigned int idx,
enum gpiod_flags flags, enum gpiod_flags flags,
const char *label, const char *label,
bool platform_lookup_allowed) bool platform_lookup_allowed)
{ {
unsigned long lookupflags = GPIO_LOOKUP_FLAGS_DEFAULT; unsigned long lookupflags = GPIO_LOOKUP_FLAGS_DEFAULT;
/* /*

8
drivers/gpio/gpiolib.h
View File

@ -223,6 +223,14 @@ static inline int gpiod_request_user(struct gpio_desc *desc, const char *label)
return ret; return ret;
} }
struct gpio_desc *gpiod_find_and_request(struct device *consumer,
struct fwnode_handle *fwnode,
const char *con_id,
unsigned int idx,
enum gpiod_flags flags,
const char *label,
bool platform_lookup_allowed);
int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id, int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id,
unsigned long lflags, enum gpiod_flags dflags); unsigned long lflags, enum gpiod_flags dflags);
int gpio_set_debounce_timeout(struct gpio_desc *desc, unsigned int debounce); int gpio_set_debounce_timeout(struct gpio_desc *desc, unsigned int debounce);