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 08/10] pinctrl: sppctl: use gpiochip_dup_line_label()
Date: Thu, 30 Nov 2023 14:46:28 +0100 [thread overview]
Message-ID: <20231130134630.18198-9-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/pinctrl/sunplus/sppctl.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/sunplus/sppctl.c b/drivers/pinctrl/sunplus/sppctl.c
index bb5ef391dbe4..ae156f779a16 100644
--- a/drivers/pinctrl/sunplus/sppctl.c
+++ b/drivers/pinctrl/sunplus/sppctl.c
@@ -4,6 +4,7 @@
* Copyright (C) Sunplus Tech / Tibbo Tech.
*/
+#include <linux/cleanup.h>
#include <linux/bitfield.h>
#include <linux/device.h>
#include <linux/err.h>
@@ -500,16 +501,15 @@ static int sppctl_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
static void sppctl_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
{
- const char *label;
int i;
for (i = 0; i < chip->ngpio; i++) {
- label = gpiochip_is_requested(chip, i);
- if (!label)
- label = "";
+ char *label __free(kfree) = gpiochip_dup_line_label(chip, i);
+ if (IS_ERR(label))
+ continue;
seq_printf(s, " gpio-%03d (%-16.16s | %-16.16s)", i + chip->base,
- chip->names[i], label);
+ chip->names[i], label ?: "");
seq_printf(s, " %c", sppctl_gpio_get_direction(chip, i) ? 'I' : 'O');
seq_printf(s, ":%d", sppctl_gpio_get(chip, i));
seq_printf(s, " %s", sppctl_first_get(chip, i) ? "gpi" : "mux");
--
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 ` [PATCH v2 03/10] gpio: wm8994: " Bartosz Golaszewski
2023-11-30 16:29 ` 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 ` Bartosz Golaszewski [this message]
2023-11-30 16:37 ` [PATCH v2 08/10] pinctrl: sppctl: " 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-9-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).