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 v3 06/10] pinctrl: nomadik: use gpiochip_dup_line_label()
Date: Mon, 4 Dec 2023 10:35:05 +0100 [thread overview]
Message-ID: <20231204093509.19225-7-brgl@bgdev.pl> (raw)
In-Reply-To: <20231204093509.19225-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-nomadik.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index 863732287b1e..7911353ac97d 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -8,6 +8,7 @@
* Copyright (C) 2011-2013 Linus Walleij <linus.walleij@linaro.org>
*/
#include <linux/bitops.h>
+#include <linux/cleanup.h>
#include <linux/clk.h>
#include <linux/device.h>
#include <linux/err.h>
@@ -917,7 +918,6 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
struct pinctrl_dev *pctldev, struct gpio_chip *chip,
unsigned offset, unsigned gpio)
{
- const char *label = gpiochip_is_requested(chip, offset);
struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(chip);
int mode;
bool is_out;
@@ -934,6 +934,10 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
[NMK_GPIO_ALT_C+4] = "altC4",
};
+ char *label = gpiochip_dup_line_label(chip, offset);
+ if (IS_ERR(label))
+ return;
+
clk_enable(nmk_chip->clk);
is_out = !!(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
pull = !(readl(nmk_chip->addr + NMK_GPIO_PDIS) & BIT(offset));
--
2.40.1
next prev parent reply other threads:[~2023-12-04 9:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 9:34 [PATCH v3 00/10] gpio/pinctrl: replace gpiochip_is_requested() with a safer interface Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 01/10] gpiolib: provide gpiochip_dup_line_label() Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 02/10] gpio: wm831x: use gpiochip_dup_line_label() Bartosz Golaszewski
2023-12-04 13:16 ` Andy Shevchenko
2023-12-04 13:38 ` Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 03/10] gpio: wm8994: " Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 04/10] gpio: stmpe: " Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 05/10] pinctrl: abx500: " Bartosz Golaszewski
2023-12-04 9:35 ` Bartosz Golaszewski [this message]
2023-12-04 9:35 ` [PATCH v3 07/10] pinctrl: baytrail: " Bartosz Golaszewski
2023-12-04 13:18 ` Andy Shevchenko
2023-12-04 13:38 ` Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 08/10] pinctrl: sppctl: " Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 09/10] gpiolib: use gpiochip_dup_line_label() in for_each helpers Bartosz Golaszewski
2023-12-04 13:24 ` Andy Shevchenko
2023-12-04 13:39 ` Bartosz Golaszewski
2023-12-04 9:35 ` [PATCH v3 10/10] gpiolib: remove gpiochip_is_requested() Bartosz Golaszewski
2023-12-04 13:22 ` Andy Shevchenko
2023-12-05 22:49 ` [PATCH v3 00/10] gpio/pinctrl: replace gpiochip_is_requested() with a safer interface Linus Walleij
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=20231204093509.19225-7-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).