From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Tue, 24 Dec 2019 12:07:00 +0000 (+0100)
Subject: gpiolib: use gpiochip_get_desc() in linehandle_create()
X-Git-Tag: v5.15~4628^2^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f41dabe45df9fe68d3207c5b7af905db7c00ce4;p=platform%2Fkernel%2Flinux-starfive.git

gpiolib: use gpiochip_get_desc() in linehandle_create()

Unduplicate the ngpio check by simply calling gpiochip_get_desc() and
checking its return value.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 342c960..166160c 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -678,14 +678,13 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
 	/* Request each GPIO */
 	for (i = 0; i < handlereq.lines; i++) {
 		u32 offset = handlereq.lineoffsets[i];
-		struct gpio_desc *desc;
+		struct gpio_desc *desc = gpiochip_get_desc(gdev->chip, offset);
 
-		if (offset >= gdev->ngpio) {
-			ret = -EINVAL;
+		if (IS_ERR(desc)) {
+			ret = PTR_ERR(desc);
 			goto out_free_descs;
 		}
 
-		desc = &gdev->descs[offset];
 		ret = gpiod_request(desc, lh->label);
 		if (ret)
 			goto out_free_descs;