gpio: wm8994: use gpiochip_dup_line_label()
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Mon, 4 Dec 2023 09:35:02 +0000 (10:35 +0100)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Fri, 8 Dec 2023 08:26:25 +0000 (09:26 +0100)
Use the new gpiochip_dup_line_label() helper to safely retrieve the
descriptor label.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-wm8994.c

index f4a474cef32d87b9d8b5ba0ac2a53098fb6e6253..bf05c9b5882b89c1abbe7a0617f6a45e2968dd50 100644 (file)
@@ -8,6 +8,7 @@
  *
  */
 
+#include <linux/cleanup.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -193,18 +194,20 @@ static void wm8994_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
        for (i = 0; i < chip->ngpio; i++) {
                int gpio = i + chip->base;
                int reg;
-               const char *label;
 
                /* We report the GPIO even if it's not requested since
                 * we're also reporting things like alternate
                 * functions which apply even when the GPIO is not in
                 * use as a GPIO.
                 */
-               label = gpiochip_is_requested(chip, i);
-               if (!label)
-                       label = "Unrequested";
+               char *label __free(kfree) = gpiochip_dup_line_label(chip, i);
+               if (IS_ERR(label)) {
+                       dev_err(wm8994->dev, "Failed to duplicate label\n");
+                       continue;
+               }
 
-               seq_printf(s, " gpio-%-3d (%-20.20s) ", gpio, label);
+               seq_printf(s, " gpio-%-3d (%-20.20s) ", gpio,
+                          label ?: "Unrequested");
 
                reg = wm8994_reg_read(wm8994, WM8994_GPIO_1 + i);
                if (reg < 0) {