gpiolib: cdev: simplify linereq_free

The edge detector is only ever started after the line desc has been
determined, so move edge_detector_stop() inside the line desc check,
and merge the two checked regions into one.

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Dipen Patel <dipenp@nvidia.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index 0c9a63becfef5c38fb2254643ee7bd0b0905905a..b44526e3630eef1ea7f30a8151dc84b505441ccc 100644 (file)
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -1460,15 +1460,15 @@ static ssize_t linereq_read(struct file *file,
 static void linereq_free(struct linereq *lr)
 {
        unsigned int i;
-       bool hte = false;
+       bool hte;
 
        for (i = 0; i < lr->num_lines; i++) {
-               if (lr->lines[i].desc)
+               if (lr->lines[i].desc) {
                        hte = !!test_bit(FLAG_EVENT_CLOCK_HTE,
                                         &lr->lines[i].desc->flags);
-               edge_detector_stop(&lr->lines[i], hte);
-               if (lr->lines[i].desc)
+                       edge_detector_stop(&lr->lines[i], hte);
                        gpiod_free(lr->lines[i].desc);
+               }
        }
        kfifo_free(&lr->events);
        kfree(lr->label);