From: Bartosz Golaszewski <brgl@bgdev.pl>
To: "Linus Walleij" <linus.walleij@linaro.org>,
"Bartosz Golaszewski" <brgl@bgdev.pl>,
"Michael Walle" <mwalle@kernel.org>,
"Bamvor Jian Zhang" <bamv2005@gmail.com>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
Keerthy <j-keerthy@ti.com>,
"Uwe Kleine-König" <ukleinek@kernel.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pwm@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Subject: [PATCH v2 07/15] gpio: regmap: use value returning setters
Date: Thu, 20 Feb 2025 10:57:04 +0100 [thread overview]
Message-ID: <20250220-gpio-set-retval-v2-7-bc4cfd38dae3@linaro.org> (raw)
In-Reply-To: <20250220-gpio-set-retval-v2-0-bc4cfd38dae3@linaro.org>
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
struct gpio_chip now has additional variants of the set(_multiple)
driver callbacks that return an integer to indicate success or failure.
Convert the driver to using them.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/gpio/gpio-regmap.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c
index 05f8781b5204..10d043596247 100644
--- a/drivers/gpio/gpio-regmap.c
+++ b/drivers/gpio/gpio-regmap.c
@@ -81,33 +81,43 @@ static int gpio_regmap_get(struct gpio_chip *chip, unsigned int offset)
return !!(val & mask);
}
-static void gpio_regmap_set(struct gpio_chip *chip, unsigned int offset,
- int val)
+static int gpio_regmap_set(struct gpio_chip *chip, unsigned int offset,
+ int val)
{
struct gpio_regmap *gpio = gpiochip_get_data(chip);
unsigned int base = gpio_regmap_addr(gpio->reg_set_base);
unsigned int reg, mask;
+ int ret;
+
+ ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
+ if (ret)
+ return ret;
- gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
if (val)
- regmap_update_bits(gpio->regmap, reg, mask, mask);
+ ret = regmap_update_bits(gpio->regmap, reg, mask, mask);
else
- regmap_update_bits(gpio->regmap, reg, mask, 0);
+ ret = regmap_update_bits(gpio->regmap, reg, mask, 0);
+
+ return ret;
}
-static void gpio_regmap_set_with_clear(struct gpio_chip *chip,
- unsigned int offset, int val)
+static int gpio_regmap_set_with_clear(struct gpio_chip *chip,
+ unsigned int offset, int val)
{
struct gpio_regmap *gpio = gpiochip_get_data(chip);
unsigned int base, reg, mask;
+ int ret;
if (val)
base = gpio_regmap_addr(gpio->reg_set_base);
else
base = gpio_regmap_addr(gpio->reg_clr_base);
- gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
- regmap_write(gpio->regmap, reg, mask);
+ ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
+ if (ret)
+ return ret;
+
+ return regmap_write(gpio->regmap, reg, mask);
}
static int gpio_regmap_get_direction(struct gpio_chip *chip,
@@ -266,9 +276,9 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config
chip->free = gpiochip_generic_free;
chip->get = gpio_regmap_get;
if (gpio->reg_set_base && gpio->reg_clr_base)
- chip->set = gpio_regmap_set_with_clear;
+ chip->set_rv = gpio_regmap_set_with_clear;
else if (gpio->reg_set_base)
- chip->set = gpio_regmap_set;
+ chip->set_rv = gpio_regmap_set;
chip->get_direction = gpio_regmap_get_direction;
if (gpio->reg_dir_in_base || gpio->reg_dir_out_base) {
--
2.45.2
next prev parent reply other threads:[~2025-02-20 9:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-20 9:56 [PATCH v2 00/15] gpiolib: indicate errors in value setters Bartosz Golaszewski
2025-02-20 9:56 ` [PATCH v2 01/15] leds: aw200xx: don't use return with gpiod_set_value() variants Bartosz Golaszewski
2025-03-06 22:51 ` (subset) " Lee Jones
2025-03-07 7:03 ` Bartosz Golaszewski
2025-03-13 15:29 ` Lee Jones
2025-02-20 9:56 ` [PATCH v2 02/15] gpiolib: make value setters have return values Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 03/15] gpiolib: wrap gpio_chip::set() Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 04/15] gpiolib: rework the wrapper around gpio_chip::set_multiple() Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 05/15] gpiolib: introduce gpio_chip setters that return values Bartosz Golaszewski
[not found] ` <CGME20250227140054eucas1p2bf6e3f2416e11e3c62a704682bf052bf@eucas1p2.samsung.com>
2025-02-27 14:00 ` Marek Szyprowski
2025-02-27 14:10 ` Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 06/15] gpio: sim: use value returning setters Bartosz Golaszewski
2025-02-20 9:57 ` Bartosz Golaszewski [this message]
2025-02-20 10:08 ` [PATCH v2 07/15] gpio: regmap: " Michael Walle
2025-02-20 9:57 ` [PATCH v2 08/15] gpio: pca953x: " Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 09/15] gpio: mockup: " Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 10/15] gpio: aggregator: " Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 11/15] gpio: max77650: " Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 12/15] gpio: latch: use lock guards Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 13/15] gpio: latch: use value returning setters Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 14/15] gpio: davinci: " Bartosz Golaszewski
2025-02-20 9:57 ` [PATCH v2 15/15] gpio: mvebu: " Bartosz Golaszewski
2025-02-21 9:33 ` [PATCH v2 00/15] gpiolib: indicate errors in value setters Uwe Kleine-König
2025-02-26 10:19 ` Bartosz Golaszewski
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=20250220-gpio-set-retval-v2-7-bc4cfd38dae3@linaro.org \
--to=brgl@bgdev.pl \
--cc=bamv2005@gmail.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=geert+renesas@glider.be \
--cc=j-keerthy@ti.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=mwalle@kernel.org \
--cc=ukleinek@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).