| Message ID | 20230309185626.84997-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | c122f461ccac0e78e8e45d4f6de14e58942572f6 |
| Headers | show |
| Series | [v1,1/1] gpiolib: Remove duplicative check in gpiod_find_and_request() | expand |
On Thu, Mar 9, 2023 at 7:56 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Thu, Mar 9, 2023 at 7:56 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpiolib.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index 8ecfe3afde1e..333ccd44e2b2 100644 > --- a/drivers/gpio/gpiolib.c > +++ b/drivers/gpio/gpiolib.c > @@ -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 > -- > 2.39.1 > Applied, thanks! Bart
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 8ecfe3afde1e..333ccd44e2b2 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -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
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpiolib.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)