From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Subject: [PATCH v2 03/10] gpio: wm8994: use gpiochip_dup_line_label()
Date: Thu, 30 Nov 2023 14:46:23 +0100 [thread overview]
Message-ID: <20231130134630.18198-4-brgl@bgdev.pl> (raw)
In-Reply-To: <20231130134630.18198-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Use the new gpiochip_dup_line_label() helper to safely retrieve the
descriptor label.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/gpio/gpio-wm8994.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index f4a474cef32d..bf05c9b5882b 100644
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -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) {
--
2.40.1
next prev parent reply other threads:[~2023-11-30 13:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 13:46 [PATCH v2 00/10] gpio/pinctrl: replace gpiochip_is_requested() with a safer interface Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 01/10] gpiolib: provide gpiochip_dup_line_label() Bartosz Golaszewski
2023-11-30 16:27 ` Andy Shevchenko
2023-11-30 17:48 ` Bartosz Golaszewski
2023-11-30 18:00 ` Andy Shevchenko
2023-11-30 19:40 ` Bartosz Golaszewski
2023-12-01 10:54 ` Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 02/10] gpio: wm831x: use gpiochip_dup_line_label() Bartosz Golaszewski
2023-11-30 13:46 ` Bartosz Golaszewski [this message]
2023-11-30 16:29 ` [PATCH v2 03/10] gpio: wm8994: " Andy Shevchenko
2023-11-30 13:46 ` [PATCH v2 04/10] gpio: stmpe: " Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 05/10] pinctrl: abx500: " Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 06/10] pinctrl: nomadik: " Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 07/10] pinctrl: baytrail: " Bartosz Golaszewski
2023-11-30 16:36 ` Andy Shevchenko
2023-11-30 17:39 ` Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 08/10] pinctrl: sppctl: " Bartosz Golaszewski
2023-11-30 16:37 ` Andy Shevchenko
2023-11-30 17:43 ` Bartosz Golaszewski
2023-11-30 13:46 ` [PATCH v2 09/10] gpiolib: use gpiochip_dup_line_label() in for_each helpers Bartosz Golaszewski
2023-11-30 16:40 ` Andy Shevchenko
2023-11-30 17:42 ` Bartosz Golaszewski
2023-11-30 17:54 ` Andy Shevchenko
2023-11-30 13:46 ` [PATCH v2 10/10] gpiolib: remove gpiochip_is_requested() Bartosz Golaszewski
2023-11-30 16:46 ` Andy Shevchenko
2023-11-30 17:46 ` Bartosz Golaszewski
2023-11-30 18:01 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231130134630.18198-4-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).