pinctrl: baytrail: use gpiochip_dup_line_label()
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Mon, 4 Dec 2023 09:35:06 +0000 (10:35 +0100)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Fri, 8 Dec 2023 08:26:35 +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>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/intel/pinctrl-baytrail.c

index 3cd0798ee6313790a284fa9d9920b56a96d2c4a4..3c8c02043481683474aa90597a071cac4cba1dcd 100644 (file)
@@ -9,6 +9,7 @@
 #include <linux/acpi.h>
 #include <linux/array_size.h>
 #include <linux/bitops.h>
+#include <linux/cleanup.h>
 #include <linux/gpio/driver.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -1173,7 +1174,6 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                const char *pull_str = NULL;
                const char *pull = NULL;
                unsigned long flags;
-               const char *label;
                unsigned int pin;
 
                pin = vg->soc->pins[i].number;
@@ -1200,9 +1200,10 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                        seq_printf(s, "Pin %i: can't retrieve community\n", pin);
                        continue;
                }
-               label = gpiochip_is_requested(chip, i);
-               if (!label)
-                       label = "Unrequested";
+
+               char *label __free(kfree) = gpiochip_dup_line_label(chip, i);
+               if (IS_ERR(label))
+                       continue;
 
                switch (conf0 & BYT_PULL_ASSIGN_MASK) {
                case BYT_PULL_ASSIGN_UP:
@@ -1231,7 +1232,7 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                seq_printf(s,
                           " gpio-%-3d (%-20.20s) %s %s %s pad-%-3d offset:0x%03x mux:%d %s%s%s",
                           pin,
-                          label,
+                          label ?: "Unrequested",
                           val & BYT_INPUT_EN ? "  " : "in",
                           val & BYT_OUTPUT_EN ? "   " : "out",
                           str_hi_lo(val & BYT_LEVEL),