Commit 0d776cfd authored by Stephen Boyd's avatar Stephen Boyd Committed by Bartosz Golaszewski
Browse files

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



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: 8eb1f71e ("gpiolib: consolidate GPIO lookups")
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent ebb03f69

drivers/gpio/gpiolib-devres.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev, 
	if (!dr)

		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)) {

		devres_free(dr);

		return desc;

drivers/gpio/gpiolib.c

+7 −7
Original line number Diff line number Diff line
@@ -4171,7 +4171,7 @@ static struct gpio_desc *gpiod_find_by_fwnode(struct fwnode_handle *fwnode, 
	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,

					 const char *con_id,

					 unsigned int idx,

drivers/gpio/gpiolib.h

+8 −0
Original line number Diff line number Diff line
@@ -223,6 +223,14 @@ static inline int gpiod_request_user(struct gpio_desc *desc, const char *label) 
	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,

		unsigned long lflags, enum gpiod_flags dflags);

int gpio_set_debounce_timeout(struct gpio_desc *desc, unsigned int debounce);