Commit c122f461 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Remove duplicative check in gpiod_find_and_request() 



The gpiod_find_by_fwnode() already checks for NULL and returns
correct error code in case fwnode is invalid. Drop the respective
check and assignment in the gpiod_find_and_request().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 7aa90f90

drivers/gpio/gpiolib.c

+2 −5
Original line number Diff line number Diff line
@@ -3926,13 +3926,10 @@ static struct gpio_desc *gpiod_find_and_request(struct device *consumer, 
						bool platform_lookup_allowed)

{

	unsigned long lookupflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	struct gpio_desc *desc = ERR_PTR(-ENOENT);

	struct gpio_desc *desc;

	int ret;



	if (!IS_ERR_OR_NULL(fwnode))

		desc = gpiod_find_by_fwnode(fwnode, consumer, con_id, idx,

					    &flags, &lookupflags);



	desc = gpiod_find_by_fwnode(fwnode, consumer, con_id, idx, &flags, &lookupflags);

	if (gpiod_not_found(desc) && platform_lookup_allowed) {

		/*

		 * Either we are not using DT or ACPI, or their lookup did not