linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 05/10] pinctrl: abx500: use gpiochip_dup_line_label()
Date: Thu, 30 Nov 2023 14:46:25 +0100	[thread overview]
Message-ID: <20231130134630.18198-6-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/nomadik/pinctrl-abx500.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index d3c32d809bac..80e3ac333136 100644
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -6,7 +6,9 @@
  *
  * Driver allows to use AxB5xx unused pins to be used as GPIO
  */
+
 #include <linux/bitops.h>
+#include <linux/cleanup.h>
 #include <linux/err.h>
 #include <linux/gpio/driver.h>
 #include <linux/init.h>
@@ -453,12 +455,11 @@ static void abx500_gpio_dbg_show_one(struct seq_file *s,
 				     unsigned offset, unsigned gpio)
 {
 	struct abx500_pinctrl *pct = pinctrl_dev_get_drvdata(pctldev);
-	const char *label = gpiochip_is_requested(chip, offset - 1);
 	u8 gpio_offset = offset - 1;
 	int mode = -1;
 	bool is_out;
 	bool pd;
-	int ret;
+	int ret = -ENOMEM;
 
 	const char *modes[] = {
 		[ABX500_DEFAULT]	= "default",
@@ -474,6 +475,10 @@ static void abx500_gpio_dbg_show_one(struct seq_file *s,
 		[ABX500_GPIO_PULL_UP]		= "pull up",
 	};
 
+	char *label __free(kfree) = gpiochip_dup_line_label(chip, offset - 1);
+	if (IS_ERR(label))
+		goto out;
+
 	ret = abx500_gpio_get_bit(chip, AB8500_GPIO_DIR1_REG,
 			gpio_offset, &is_out);
 	if (ret < 0)
-- 
2.40.1


  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 ` Bartosz Golaszewski [this message]
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-6-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).