Skip to contentSkip to conversation

gpiolib: Remove duplicative check in gpiod_find_and_request()

PATCH Applied Andy Shevchenko 3 participants 3 messages Mar 9, 2023 – Mar 15, 2023 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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().

---
 drivers/gpio/gpiolib.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpio/gpiolib.c +2 -5
index 8ecfe3afde1e..333ccd44e2b2 100644
@@ -3927,13 +3927,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
Signature · 1 line
2.39.1
#2 lore raw
In reply to Andy Shevchenko
Quoted 31 lines · Andy Shevchenko

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().

---
 drivers/gpio/gpiolib.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpio/gpiolib.c +2 -6
index 8ecfe3afde1e..333ccd44e2b2 100644
@@ -3927,13 +3927,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
--
Quoted 2 lines

2.39.1

Applied, thanks!

Bart